[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] efidisk: null pointer dereference in grub_efidisk_get_device
|
From: |
Eric Snowberg |
|
Subject: |
[PATCH 2/2] efidisk: null pointer dereference in grub_efidisk_get_device_name |
|
Date: |
Thu, 28 Mar 2019 15:26:37 -0600 |
Function grub_efi_find_last_device_path may return NULL when called
from grub_efidisk_get_device_name
Signed-off-by: Eric Snowberg <address@hidden>
---
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