vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

efi: check *path non-null before grub_strrchr

Browse source 
The EFI version of grub_machine_get_bootlocation crops the boot image
name back to the last / in order to get a directory path. However, it
does not check that *name is actually set before calling grub_strrchr
to do this, and neither does grub_strrchr before dereferencing a NULL
pointer.

Parent function, grub_set_prefix_and_root, does check the pointer
before using.
This commit is contained in:
Leif Lindholm 2014-11-17 14:11:01 +00:00
parent 72ec399ad8
commit 004a2b1efd
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-07 Leif Lindholm <leif.lindholm@linaro.org>
* grub-core/kern/efi/init.c: check value of *path before
dereferencing.
2014-11-03 Michael Chang <mchang@suse.com> 2014-11-03 Michael Chang <mchang@suse.com>
* grub-core/net/icmp6.c (grub_net_recv_icmp6_packet): Fix size * grub-core/net/icmp6.c (grub_net_recv_icmp6_packet): Fix size

3
grub-core/kern/efi/init.c
View file

@ -63,11 +63,14 @@ grub_machine_get_bootlocation (char **device, char **path)
if (!*device && grub_efi_net_config) if (!*device && grub_efi_net_config)
grub_efi_net_config (image->device_handle, device, path); grub_efi_net_config (image->device_handle, device, path);
if (*path)
{
/* Get the directory. */ /* Get the directory. */
p = grub_strrchr (*path, '/'); p = grub_strrchr (*path, '/');
if (p) if (p)
*p = '\0'; *p = '\0';
} }
}
void void
grub_efi_fini (void) grub_efi_fini (void)