]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
efi_loader: Fix potential deref-after-null
authorMaks Mishin <maks.mishinfz@gmail.com>
Sun, 2 Feb 2025 17:59:40 +0000 (20:59 +0300)
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Thu, 20 Feb 2025 08:04:12 +0000 (09:04 +0100)
After having been compared to a NULL value at efi_disk.c:426,
pointer 'part_info' is dereferenced at efi_disk.c:534.

Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
lib/efi_loader/efi_disk.c

index 1f3de0a23399087617e14e220f13d770bc12c490..5452640354e07c92a96410d212b1a875090bcaae 100644 (file)
@@ -531,7 +531,8 @@ static efi_status_t efi_disk_add_dev(
 
        /* Store first EFI system partition */
        if (part && efi_system_partition.uclass_id == UCLASS_INVALID) {
-               if (part_info->bootable & PART_EFI_SYSTEM_PARTITION) {
+               if (part_info &&
+                   part_info->bootable & PART_EFI_SYSTEM_PARTITION) {
                        efi_system_partition.uclass_id = desc->uclass_id;
                        efi_system_partition.devnum = desc->devnum;
                        efi_system_partition.part = part;