Skip to content

F
FMC Bus
Commit 7a652805 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

bug fix: check strings for NULL in match() 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 9ea8a363
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
kernel/fmc-match.c
View file @ 7a652805
...@@ -32,10 +32,14 @@ int fmc_match(struct device *dev, struct device_driver *drv) ...@@ -32,10 +32,14 @@ int fmc_match(struct device *dev, struct device_driver *drv)
dev_warn(&fdev->dev, "Driver has no ID: matches all\n"); dev_warn(&fdev->dev, "Driver has no ID: matches all\n");
matched = 1; matched = 1;
} else { } else {
if (!fdev->id.manufacturer || !fdev->id.product_name)
return 0; /* the device has no FRU information */
for (i = 0; i < fdrv->id_table.fru_id_nr; i++, fid++) { for (i = 0; i < fdrv->id_table.fru_id_nr; i++, fid++) {
if (strcmp(fid->manufacturer, fdev->id.manufacturer)) if (fid->manufacturer &&
strcmp(fid->manufacturer, fdev->id.manufacturer))
continue; continue;
if (strcmp(fid->product_name, fdev->id.product_name)) if (fid->product_name &&
strcmp(fid->product_name, fdev->id.product_name))
continue; continue;
matched = 1; matched = 1;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment