From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754978AbbINJII (ORCPT ); Mon, 14 Sep 2015 05:08:08 -0400 Received: from lists.s-osg.org ([54.187.51.154]:35933 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752227AbbINJIF (ORCPT ); Mon, 14 Sep 2015 05:08:05 -0400 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Lee Jones , patches@opensource.wolfsonmicro.com, Samuel Ortiz Subject: [PATCH] mfd: wm831x: Fix possible NULL pointer dereference Date: Mon, 14 Sep 2015 11:07:56 +0200 Message-Id: <1442221676-26647-1-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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) { -- 2.4.3