Skip to contentSkip to conversation

efidisk: null pointer dereference

PATCH In review Eric Snowberg 2 participants 5 messages Mar 28, 2019 – Mar 29, 2019

lore
Share & tools
lore
#0 lore raw

cover efidisk: null pointer dereference

Additional null pointer dereference fixes. I wasn't sure if you wanted all these folded into a single patch or separate.

Eric Snowberg (2):
efidisk: null pointer dereference in is_child
efidisk: null pointer dereference in grub_efidisk_get_device_name

 grub-core/disk/efi/efidisk.c | 6 ++++++
 1 file changed, 6 insertions(+)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 efidisk: null pointer dereference in is_child

Function grub_efi_find_last_device path may return NULL when called from is_child.

---
 grub-core/disk/efi/efidisk.c | 3 +++
 1 file changed, 3 insertions(+)
grub-core/disk/efi/efidisk.c +3 -0
index 961c155..78ab2d2 100644
@@ -162,6 +162,9 @@ is_child (struct grub_efidisk_data *child,
     return 0;
 
   ldp = grub_efi_find_last_device_path (dp);
+  if (! ldp)
+    return 0;
+
   ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
   ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
   ldp->length = sizeof (*ldp);
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 2/2 efidisk: null pointer dereference in grub_efidisk_get_device_name

In reply to Eric Snowberg

Function grub_efi_find_last_device_path may return NULL when called from grub_efidisk_get_device_name

---
 grub-core/disk/efi/efidisk.c | 3 +++
 1 file changed, 3 insertions(+)
grub-core/disk/efi/efidisk.c +3 -0
index 78ab2d2..9e20af7 100644
@@ -836,6 +836,9 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 	{
 	  grub_efi_device_path_t *dup_ldp;
 	  dup_ldp = grub_efi_find_last_device_path (dup_dp);
+	  if (! dup_ldp)
+	    break;
+
 	  if (!(GRUB_EFI_DEVICE_PATH_TYPE (dup_ldp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (dup_ldp) == GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE
 		    || GRUB_EFI_DEVICE_PATH_SUBTYPE (dup_ldp) == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)))
Signature · 1 line
1.8.3.1