[U-Boot] [PATCH 1/1] efi_loader: check parameters of efi_file_open()

[Heinrich Schuchardt]

Check the parameters of efi_file_open().

Signed-off-by: Heinrich Schuchardt <xypron.g...@gmx.de>
---
 lib/efi_loader/efi_file.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 89d65694da..92ca444617 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -202,15 +202,37 @@ static efi_status_t EFIAPI efi_file_open(struct 
efi_file_handle *file,
                s16 *file_name, u64 open_mode, u64 attributes)
 {
        struct file_handle *fh = to_fh(file);
+       efi_status_t ret;
 
        EFI_ENTRY("%p, %p, \"%ls\", %llx, %llu", file, new_handle, file_name,
                  open_mode, attributes);
 
-       *new_handle = file_open(fh->fs, fh, file_name, open_mode, attributes);
-       if (!*new_handle)
-               return EFI_EXIT(EFI_NOT_FOUND);
+       /* Check parameters */
+       if (!file || !file || !file_name) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+       if (open_mode != EFI_FILE_MODE_READ &&
+           open_mode != (EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE) &&
+           open_mode != (EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE |
+                        EFI_FILE_MODE_CREATE)) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+       if ((!(open_mode & EFI_FILE_MODE_CREATE) && attributes) ||
+           (attributes & (EFI_FILE_READ_ONLY | ~EFI_FILE_VALID_ATTR))) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
 
-       return EFI_EXIT(EFI_SUCCESS);
+       /* Open file */
+       *new_handle = file_open(fh->fs, fh, file_name, open_mode, attributes);
+       if (*new_handle)
+               ret = EFI_SUCCESS;
+       else
+               ret = EFI_NOT_FOUND;
+out:
+       return EFI_EXIT(ret);
 }
 
 static efi_status_t file_close(struct file_handle *fh)
-- 
2.18.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot