Limit NVMe of_path_of_nvme to just SPARC hardware for now. It has been found that non-Open Firmware hardware platforms can some how access this function.
Signed-off-by: Eric Snowberg <[email protected]> --- Note: This patch should be applied after Adrian's "ieee1275: Fix crash in of_path_of_nvme when of_path is empty" patch --- grub-core/osdep/linux/ofpath.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c index 6180621..a6153d3 100644 --- a/grub-core/osdep/linux/ofpath.c +++ b/grub-core/osdep/linux/ofpath.c @@ -350,6 +350,7 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi return ret; } +#ifdef __sparc__ static char * of_path_of_nvme(const char *sys_devname __attribute__((unused)), const char *device, @@ -396,6 +397,7 @@ of_path_of_nvme(const char *sys_devname __attribute__((unused)), free (sysfs_path); return of_path; } +#endif static int vendor_is_ATA(const char *path) @@ -728,9 +730,11 @@ grub_util_devname_to_ofpath (const char *sys_devname) /* All the models I've seen have a devalias "floppy". New models have no floppy at all. */ ofpath = xstrdup ("floppy"); +#ifdef __sparc__ else if (device[0] == 'n' && device[1] == 'v' && device[2] == 'm' && device[3] == 'e') ofpath = of_path_of_nvme (name_buf, device, devnode, devicenode); +#endif else { grub_util_warn (_("unknown device type %s"), device); -- 1.7.1 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
