From patchwork Wed May 31 17:29:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9757873 X-Patchwork-Delegate: agross@codeaurora.org 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 9E55460360 for ; Wed, 31 May 2017 17:31:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86056284C5 for ; Wed, 31 May 2017 17:31:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A0C928397; Wed, 31 May 2017 17:31:53 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 2A85D284C0 for ; Wed, 31 May 2017 17:31:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751152AbdEaR3q (ORCPT ); Wed, 31 May 2017 13:29:46 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40200 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751052AbdEaR3U (ORCPT ); Wed, 31 May 2017 13:29:20 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5690860766; Wed, 31 May 2017 17:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1496251759; bh=QIRurwLdPqLSzM7i15yS/boR2M/ZBdJ03uQUZFI1fPo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=koIOIhHFHwKvWrsX1lrW3j9mOfq4/TBCuIlcgQLsHdM1eAtY9zcinhelRQumHUqCt BAMR2D5sHOdE9uBr/T2EmarNo4vVJl9zEWT+UaObwFPAa2yEDyzWTGgubE2KkgPsTt pDupqMmbvRg6+CNkytkOHxNyKFZCTN7sVhYjWJEU= Received: from localhost (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 980EB605A2; Wed, 31 May 2017 17:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1496251758; bh=QIRurwLdPqLSzM7i15yS/boR2M/ZBdJ03uQUZFI1fPo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gx4G/hE5c2MbG/vQ4AWiHCeIXPJ8OTLZZHIuV5jMw/kGp2GUHNejIFy0BvF8vd9nI vXa/mwlY+tjHSVxas+X7wCoQOZYGlP0+++crq+AMTBbhB6EMKo+3DcsspSOSomNci9 OFN/uWeQYJmlG7NflvqNglLuud3zvr5DlIquiZ0s= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 980EB605A2 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org Date: Wed, 31 May 2017 10:29:18 -0700 From: Stephen Boyd To: Kiran Gunda Cc: Abhijeet Dharmapurikar , Greg Kroah-Hartman , Subbaraman Narayanamurthy , Christophe JAILLET , David Collins , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, adharmap@quicinc.com, aghayal@qti.qualcomm.com Subject: Re: [PATCH V1 12/15] spmi-pmic-arb: fix a possible null pointer dereference Message-ID: <20170531172918.GD20170@codeaurora.org> References: <1496147943-25822-1-git-send-email-kgunda@codeaurora.org> <1496147943-25822-13-git-send-email-kgunda@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1496147943-25822-13-git-send-email-kgunda@codeaurora.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 05/30, Kiran Gunda wrote: > diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c > index 2afe359..412481d 100644 > --- a/drivers/spmi/spmi-pmic-arb.c > +++ b/drivers/spmi/spmi-pmic-arb.c > @@ -1003,6 +1003,12 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) > pa->spmic = ctrl; > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); > + if (!res) { > + dev_err(&pdev->dev, "core resource not specified\n"); > + err = -EINVAL; > + goto err_put_ctrl; > + } > + > pa->core_size = resource_size(res); > if (pa->core_size <= 0x800) { > dev_err(&pdev->dev, "core_size is smaller than 0x800. Failing Probe\n"); I would prefer this patch instead, so that we can piggyback on the error checking of the devm_ioremap_resource() code. Also, add a Fixes: tag please so we can backport it as needed. diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 5ec3a595dc7d..0cedbda60707 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -878,12 +878,12 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) pa->spmic = ctrl; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); - pa->core_size = resource_size(res); core = devm_ioremap_resource(&ctrl->dev, res); if (IS_ERR(core)) { err = PTR_ERR(core); goto err_put_ctrl; } + pa->core_size = resource_size(res); hw_ver = readl_relaxed(core + PMIC_ARB_VERSION); is_v1 = (hw_ver < PMIC_ARB_VERSION_V2_MIN);