Commit ecc87eed authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki

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: 16ba08d5 (device property: Introduce firmware node type for platform data)
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 74d33293
...@@ -27,9 +27,10 @@ ...@@ -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);
......
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