Re: [PATCH 1/1] device property: fix potential NULL pointer dereference

["Rafael J. Wysocki" <rjw@rjwysocki.net>]

On Wednesday, August 05, 2015 04:51:11 PM Andy Shevchenko wrote:
> 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>

I don't think there are any users of this in 4.2, so I'll queue it up for 4.3.

Thanks!


> ---
>  drivers/base/property.c | 5 +++--
>  1 file 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);
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.