[PATCH] ieee1275: NULL pointer dereference in grub_machine_get_bootlocation

[PATCH] ieee1275: NULL pointer dereference in grub_machine_get_bootlocation

[Eric Snowberg]

Read from NULL pointer canon in function grub_machine_get_bootlocation.
Function grub_ieee1275_canonicalise_devname may return NULL.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 grub-core/kern/ieee1275/init.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index 62dfb8a..0d8ebf5 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -110,6 +110,8 @@ grub_machine_get_bootlocation (char **device, char **path)
       char *ptr;
       dev = grub_ieee1275_get_aliasdevname (bootpath);
       canon = grub_ieee1275_canonicalise_devname (dev);
+      if (! canon)
+        return;
       ptr = canon + grub_strlen (canon) - 1;
       while (ptr > canon && (*ptr == ',' || *ptr == ':'))
 	ptr--;
-- 
1.7.1

Re: [PATCH] ieee1275: NULL pointer dereference in grub_machine_get_bootlocation

[Daniel Kiper]

On Wed, Mar 14, 2018 at 08:51:17AM -0700, Eric Snowberg wrote:
> Read from NULL pointer canon in function grub_machine_get_bootlocation.
> Function grub_ieee1275_canonicalise_devname may return NULL.
>
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>

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

Daniel