Re: [PATCH v2] mfd: wm831x: add null check before pointer dereference

[Lee Jones]

On Wed, 24 May 2017, Gustavo A. R. Silva wrote:

> Add NULL check before dereferencing pointer of_id in order to avoid
> a potential NULL pointer dereference.
> 
> Addresses-Coverity-ID: 1408829
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Gustavo A. R. Silva <garsilva@xxxxxxxxxxxxxx>
> ---
> Changes in v2:
>  Update error log and return value.
> 
>  drivers/mfd/wm831x-i2c.c | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
> index 781af06..bed66d8 100644
> --- a/drivers/mfd/wm831x-i2c.c
> +++ b/drivers/mfd/wm831x-i2c.c
> @@ -37,6 +37,10 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
>  
>  	if (i2c->dev.of_node) {
>  		of_id = of_match_device(wm831x_of_match, &i2c->dev);
> +		if (!of_id) {
> +			dev_err(&i2c->dev, "Failed to match device\n");
> +			return -ENODEV;
> +		}
>  		type = (enum wm831x_parent)of_id->data;
>  	} else {
>  		type = (enum wm831x_parent)id->driver_data;

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog