efi_loader: Cleanup get_var duplication

get_var() is defined statically in efi_bootmgr.c and doesn't properly
check a buffer allocation.  Remove it completely and use the exported
function from efi_var_common.c that does the same thing

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 46c8011344b9aae30a8627ffe5032ffeeb4c8906..1fe19237f9a6ce2ea18558717985e62aec184192 100644 (file)
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -30,38 +30,6 @@ static const struct efi_runtime_services *rs;
  * should do normal or recovery boot.
  */
 
-/**
- * get_var() - get UEFI variable
- *
- * It is the caller's duty to free the returned buffer.
- *
- * @name:      name of variable
- * @vendor:    vendor GUID of variable
- * @size:      size of allocated buffer
- * Return:     buffer with variable data or NULL
- */
-static void *get_var(u16 *name, const efi_guid_t *vendor,
-                    efi_uintn_t *size)
-{
-       efi_status_t ret;
-       void *buf = NULL;
-
-       *size = 0;
-       ret = efi_get_variable_int(name, vendor, NULL, size, buf, NULL);
-       if (ret == EFI_BUFFER_TOO_SMALL) {
-               buf = malloc(*size);
-               ret = efi_get_variable_int(name, vendor, NULL, size, buf, NULL);
-       }
-
-       if (ret != EFI_SUCCESS) {
-               free(buf);
-               *size = 0;
-               return NULL;
-       }
-
-       return buf;
-}
-
 /**
  * try_load_entry() - try to load image for boot option
  *
@@ -89,7 +57,7 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle,
        varname[6] = hexmap[(n & 0x00f0) >> 4];
        varname[7] = hexmap[(n & 0x000f) >> 0];
 
-       load_option = get_var(varname, &efi_global_variable_guid, &size);
+       load_option = efi_get_var(varname, &efi_global_variable_guid, &size);
        if (!load_option)
                return EFI_LOAD_ERROR;
 
@@ -210,7 +178,7 @@ efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_options)
        }
 
        /* BootOrder */
-       bootorder = get_var(L"BootOrder", &efi_global_variable_guid, &size);
+       bootorder = efi_get_var(L"BootOrder", &efi_global_variable_guid, &size);
        if (!bootorder) {
                log_info("BootOrder not defined\n");
                ret = EFI_NOT_FOUND;