efi_loader: do not install NULL as device path
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Fri, 26 Jan 2018 05:50:54 +0000 (06:50 +0100)
committerAlexander Graf <agraf@suse.de>
Sun, 28 Jan 2018 20:37:13 +0000 (21:37 +0100)
In an image is loaded from memory we do not have a device path.
Do not install NULL as device path in this case.

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

index 4a36b62..da93498 100644 (file)
@@ -1367,16 +1367,18 @@ efi_status_t efi_setup_loaded_image(
        obj->handle = info;
 
        info->file_path = file_path;
-       if (device_path)
-               info->device_handle = efi_dp_find_obj(device_path, NULL);
 
-       /*
-        * When asking for the device path interface, return
-        * bootefi_device_path
-        */
-       ret = efi_add_protocol(obj->handle, &efi_guid_device_path, device_path);
-       if (ret != EFI_SUCCESS)
-               goto failure;
+       if (device_path) {
+               info->device_handle = efi_dp_find_obj(device_path, NULL);
+               /*
+                * When asking for the device path interface, return
+                * bootefi_device_path
+                */
+               ret = efi_add_protocol(obj->handle, &efi_guid_device_path,
+                                      device_path);
+               if (ret != EFI_SUCCESS)
+                       goto failure;
+       }
 
        /*
         * When asking for the loaded_image interface, just