[PATCH 0/2] efidisk: null pointer dereference

[PATCH 0/2] efidisk: null pointer dereference

[Eric Snowberg]

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(+)

-- 
1.8.3.1

[PATCH 1/2] efidisk: null pointer dereference in is_child

[Eric Snowberg]

Function grub_efi_find_last_device path may return NULL when called
from is_child.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 grub-core/disk/efi/efidisk.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 961c155..78ab2d2 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -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);
-- 
1.8.3.1

[PATCH 2/2] efidisk: null pointer dereference in grub_efidisk_get_device_name

[Eric Snowberg]

Function grub_efi_find_last_device_path may return NULL when called
from grub_efidisk_get_device_name

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 grub-core/disk/efi/efidisk.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 78ab2d2..9e20af7 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -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)))
-- 
1.8.3.1

Re: [PATCH 1/2] efidisk: null pointer dereference in is_child

[Daniel Kiper]

On Thu, Mar 28, 2019 at 03:26:36PM -0600, Eric Snowberg wrote:
> Function grub_efi_find_last_device path may return NULL when called
> from is_child.
>
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

Re: [PATCH 2/2] efidisk: null pointer dereference in grub_efidisk_get_device_name

[Daniel Kiper]

On Thu, Mar 28, 2019 at 03:26:37PM -0600, Eric Snowberg wrote:
> Function grub_efi_find_last_device_path may return NULL when called
> from grub_efidisk_get_device_name
>
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel