p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

device property: fix potential NULL pointer dereference 

In device_add_property_set() we check pset parameter for a NULL, but few lines
later we do a pointer arithmetic without check that will crash kernel in the
set_secondary_fwnode().

Here we check if pset parameter is NULL and return immediately.

Fixes: 16ba08d5c9 (device property: Introduce firmware node type for platform data)
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Andy Shevchenko 2015-08-05 16:51:11 +03:00 committed by Rafael J. Wysocki
parent 74d33293e4
commit ecc87eed7b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/property.c
View File

@ -27,9 +27,10 @@
*/ */
void device_add_property_set(struct device *dev, struct property_set *pset) void device_add_property_set(struct device *dev, struct property_set *pset)
{ {
if (pset) if (!pset)
pset->fwnode.type = FWNODE_PDATA; return;
pset->fwnode.type = FWNODE_PDATA;
set_secondary_fwnode(dev, &pset->fwnode); set_secondary_fwnode(dev, &pset->fwnode);
} }
EXPORT_SYMBOL_GPL(device_add_property_set); EXPORT_SYMBOL_GPL(device_add_property_set);