efi_loader: GetVariable set attributes for EFI_BUFFER_TOO_SMALL
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 15 May 2019 17:32:43 +0000 (19:32 +0200)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Sun, 19 May 2019 06:10:10 +0000 (08:10 +0200)
UEFI spec 2.7 erratum A leaves it undefined if Attributes should be set if
GetVariable() returns EFI_BUFFER_TOO_SMALL.

UEFI spec 2.8 defines that Attributes should be set if the return value is
either EFI_SUCCESS or EFI_BUFFER_TOO_SMALL.

Set Attributes if the return value is EFI_BUFFER_TOO_SMALL.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
lib/efi_loader/efi_variable.c

index 37728c3c165ddabf2af7ca7f254ffdf93bcfd54d..28b1aa7505ae2d1f31f41380adcae42252f0a18a 100644 (file)
@@ -202,8 +202,10 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
                len /= 2;
                *data_size = len;
 
-               if (in_size < len)
-                       return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
+               if (in_size < len) {
+                       ret = EFI_BUFFER_TOO_SMALL;
+                       goto out;
+               }
 
                if (!data)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
@@ -217,8 +219,10 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
 
                *data_size = len;
 
-               if (in_size < len)
-                       return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
+               if (in_size < len) {
+                       ret = EFI_BUFFER_TOO_SMALL;
+                       goto out;
+               }
 
                if (!data)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
@@ -232,10 +236,11 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
                return EFI_EXIT(EFI_DEVICE_ERROR);
        }
 
+out:
        if (attributes)
                *attributes = attr & EFI_VARIABLE_MASK;
 
-       return EFI_EXIT(EFI_SUCCESS);
+       return EFI_EXIT(ret);
 }
 
 static char *efi_variables_list;