efi_loader: parameter checks EFI_FILE_PROTOCOL.SetInfo()
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Sun, 8 Sep 2019 09:37:07 +0000 (11:37 +0200)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 11 Sep 2019 19:51:38 +0000 (21:51 +0200)
We do not support volume label changes. No parameter checks are needed
here.

When the info for as file is changed the buffer must always contain a file
name.

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

index 71582e5..6d3f680 100644 (file)
@@ -695,7 +695,9 @@ static efi_status_t EFIAPI efi_file_setinfo(struct efi_file_handle *file,
                char *new_file_name, *pos;
                loff_t file_size;
 
-               if (buffer_size < sizeof(struct efi_file_info)) {
+               /* The buffer will always contain a file name. */
+               if (buffer_size < sizeof(struct efi_file_info) + 2 ||
+                   buffer_size < info->size) {
                        ret = EFI_BAD_BUFFER_SIZE;
                        goto out;
                }
@@ -735,12 +737,8 @@ static efi_status_t EFIAPI efi_file_setinfo(struct efi_file_handle *file,
                 * TODO: Support read only
                 */
                ret = EFI_SUCCESS;
-       } else if (!guidcmp(info_type, &efi_file_system_info_guid)) {
-               if (buffer_size < sizeof(struct efi_file_system_info)) {
-                       ret = EFI_BAD_BUFFER_SIZE;
-                       goto out;
-               }
        } else {
+               /* TODO: We do not support changing the volume label */
                ret = EFI_UNSUPPORTED;
        }
 out: