Messages in this thread | | | Date | Sun, 20 Sep 2015 05:18:01 +0100 | From | Lee Jones <> | Subject | Re: [PATCH] mfd: wm831x: Fix possible NULL pointer dereference |
| |
On Mon, 14 Sep 2015, Javier Martinez Canillas wrote:
> The driver always checks for pdata being NULL expect in one place. > Add a check to prevent a possible NULL pointer deference error. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > > --- > > drivers/mfd/wm831x-core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.
NB: I'll also try to remember to fix-up the spelling error in the commit log.
> diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c > index 28366a90e1ad..3e0e99ec5836 100644 > --- a/drivers/mfd/wm831x-core.c > +++ b/drivers/mfd/wm831x-core.c > @@ -1626,7 +1626,9 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) > mutex_init(&wm831x->io_lock); > mutex_init(&wm831x->key_lock); > dev_set_drvdata(wm831x->dev, wm831x); > - wm831x->soft_shutdown = pdata->soft_shutdown; > + > + if (pdata) > + wm831x->soft_shutdown = pdata->soft_shutdown; > > ret = wm831x_reg_read(wm831x, WM831X_PARENT_ID); > if (ret < 0) {
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |