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

ieee1275: Fix crash in of_path_of_nvme when of_path is empty

Browse source 
The of_path_of_nvme function (commit 2391d57, ieee1275: add nvme
support within ofpath) introduced a functional regression:

On systems which are not based on Open Firmware but have at
least one NVME device, find_obppath will return NULL and thus
trying to append the disk name to of_path will result in a
crash.

The proper behavior of of_path_of_nvme is, however, to just
return NULL in such cases, like other users of find_obppath,
such as of_path_of_scsi.

Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
John Paul Adrian Glaubitz 2018-03-01 23:34:53 +01:00 committed by Vincent Batts
parent a74a47aad3
commit 455dda2544
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grub-core/osdep/linux/ofpath.c
View file

@ -389,8 +389,11 @@ of_path_of_nvme(const char *sys_devname __attribute__((unused)),
} }
of_path = find_obppath (sysfs_path); of_path = find_obppath (sysfs_path);
free (sysfs_path);
if (of_path)
strcat (of_path, disk); strcat (of_path, disk);
free (sysfs_path);
return of_path; return of_path;
} }