From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755245AbbITESL (ORCPT ); Sun, 20 Sep 2015 00:18:11 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36724 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755077AbbITESH (ORCPT ); Sun, 20 Sep 2015 00:18:07 -0400 Date: Sun, 20 Sep 2015 05:18:01 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com, Samuel Ortiz Subject: Re: [PATCH] mfd: wm831x: Fix possible NULL pointer dereference Message-ID: <20150920041801.GM3039@x1> References: <1442221676-26647-1-git-send-email-javier@osg.samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1442221676-26647-1-git-send-email-javier@osg.samsung.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > --- > > 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