summaryrefslogtreecommitdiff
path: root/drivers/base/property.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2015-08-05 13:51:11 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-08-05 23:50:21 (GMT)
commitecc87eed7beeb50c0be0b73322d62135277ea2b0 (patch)
treece32172e59a40bf99a451dfd91a6c384251e5963 /drivers/base/property.c
parent74d33293e467df61de1b1d8b2fbe29e550dec33b (diff)
downloadlinux-ecc87eed7beeb50c0be0b73322d62135277ea2b0.tar.xz
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: 16ba08d5c9ec (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>
Diffstat (limited to 'drivers/base/property.c')
-rw-r--r--drivers/base/property.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c
index f3f6d16..37a7bb7 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -27,9 +27,10 @@
*/
void device_add_property_set(struct device *dev, struct property_set *pset)
{
- if (pset)
- pset->fwnode.type = FWNODE_PDATA;
+ if (!pset)
+ return;
+ pset->fwnode.type = FWNODE_PDATA;
set_secondary_fwnode(dev, &pset->fwnode);
}
EXPORT_SYMBOL_GPL(device_add_property_set);