]> git.sur5r.net Git - u-boot/commitdiff
efi_loader: parameter checks for LoadImage
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 7 Mar 2018 01:40:51 +0000 (02:40 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 4 Apr 2018 09:00:06 +0000 (11:00 +0200)
Add parameter checks in efi_load_image().
Check memory allocation is successful in efi_load_image().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
lib/efi_loader/efi_boottime.c

index 66e26fd63a128229a8d62595dd8709d09b801fab..8892c86f41943f98d46f7547af21a04b62807c3d 100644 (file)
@@ -1515,8 +1515,27 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy,
        EFI_ENTRY("%d, %p, %pD, %p, %ld, %p", boot_policy, parent_image,
                  file_path, source_buffer, source_size, image_handle);
 
+       if (!image_handle || !parent_image) {
+               ret = EFI_INVALID_PARAMETER;
+               goto error;
+       }
+
+       if (!source_buffer && !file_path) {
+               ret = EFI_NOT_FOUND;
+               goto error;
+       }
+
        info = calloc(1, sizeof(*info));
+       if (!info) {
+               ret = EFI_OUT_OF_RESOURCES;
+               goto error;
+       }
        obj = calloc(1, sizeof(*obj));
+       if (!obj) {
+               free(info);
+               ret = EFI_OUT_OF_RESOURCES;
+               goto error;
+       }
 
        if (!source_buffer) {
                struct efi_device_path *dp, *fp;
@@ -1552,6 +1571,7 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy,
 failure:
        free(info);
        efi_delete_handle(obj);
+error:
        return EFI_EXIT(ret);
 }