From patchwork Mon May 1 08:49:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Reid X-Patchwork-Id: 9706339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 909BD60390 for ; Mon, 1 May 2017 08:57:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F17421F61 for ; Mon, 1 May 2017 08:57:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D26A269A3; Mon, 1 May 2017 08:57:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04B2226419 for ; Mon, 1 May 2017 08:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755599AbdEAI4x (ORCPT ); Mon, 1 May 2017 04:56:53 -0400 Received: from anchovy2.45ru.net.au ([203.30.46.146]:38391 "EHLO anchovy.45ru.net.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757101AbdEAI4r (ORCPT ); Mon, 1 May 2017 04:56:47 -0400 Received: (qmail 21349 invoked by uid 5089); 1 May 2017 08:50:04 -0000 Received: by simscan 1.2.0 ppid: 21299, pid: 21300, t: 0.0272s scanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.88.3/m:40/d:1950 X-RBL: $rbltext Received: from unknown (HELO preid-centos7.electromag.com.au) (preid@electromag.com.au@203.59.230.133) by anchovy3.45ru.net.au with ESMTPA; 1 May 2017 08:50:03 -0000 Received: by preid-centos7.electromag.com.au (Postfix, from userid 1000) id EEC04302E22B0; Mon, 1 May 2017 16:50:01 +0800 (AWST) From: Phil Reid To: wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com, sre@kernel.org, peda@axentia.se, preid@electromag.com.au, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v5 2/9] i2c: i2c-smbus: Add null ptr guard in smb_alert_probe Date: Mon, 1 May 2017 16:49:52 +0800 Message-Id: <1493628599-30552-3-git-send-email-preid@electromag.com.au> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1493628599-30552-1-git-send-email-preid@electromag.com.au> References: <1493628599-30552-1-git-send-email-preid@electromag.com.au> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If platdata is not correct setup before registering the device a null ptr derefence can occur. Signed-off-by: Phil Reid --- drivers/i2c/i2c-smbus.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index b272493..df0e2fa 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -151,6 +151,11 @@ static int smbalert_probe(struct i2c_client *ara, struct i2c_adapter *adapter = ara->adapter; int res; + if (!setup) { + dev_err(&adapter->dev, "setup not defined\n"); + return -ENODATA; + } + alert = devm_kzalloc(&ara->dev, sizeof(struct i2c_smbus_alert), GFP_KERNEL); if (!alert)