From patchwork Mon Jul 3 12:52:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Gunda X-Patchwork-Id: 9822659 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 32B6B60237 for ; Mon, 3 Jul 2017 12:53:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25BBC2625B for ; Mon, 3 Jul 2017 12:53:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A55927F98; Mon, 3 Jul 2017 12:53:37 +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 BF2722625B for ; Mon, 3 Jul 2017 12:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753859AbdGCMxf (ORCPT ); Mon, 3 Jul 2017 08:53:35 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52096 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853AbdGCMxc (ORCPT ); Mon, 3 Jul 2017 08:53:32 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2504E60798; Mon, 3 Jul 2017 12:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499086412; bh=Dm7NOeX3N1i0jMfqo7UG5ktgrtcKHjHl0dMs7DzjFNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UseuV6bMxrbeSW/eZYyXNqRN6iCnECwdUBvXgTvgBHd5/uX+EJXuJbrJ0f65zPRiP VSIfSBu+nCwxRVtfFRb6cVt6ndL8uaA0Lua0LFSTZ8dgMLF0H8hKK3ua4GFNKh0VpB 5dre9rDxsw78ABOHHmC9tW1akx5LD1SpMEs7dVEY= Received: from kgunda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kgunda@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E3392607E0; Mon, 3 Jul 2017 12:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499086411; bh=Dm7NOeX3N1i0jMfqo7UG5ktgrtcKHjHl0dMs7DzjFNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVBdkqsYH+OgRGVKdB66B63r4+rw/YKbGUYTQzvA+0wwiGlkK9QVCNJel/yL25mXc ay04RKLr38gzZ9DettlTUdISET+nicsL887FDf+QuIDHN1XalRsNMBCQ4JPXTvOQiQ 4h5EPBek9WxXUyXnyli8fRpvcacJ7P6rbKO3UoYM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E3392607E0 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=kgunda@codeaurora.org From: Kiran Gunda To: Kiran Gunda , Abhijeet Dharmapurikar , Stephen Boyd , David Collins , linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH V1 2/4] spmi: pmic-arb: fix a possible null pointer dereference Date: Mon, 3 Jul 2017 18:22:16 +0530 Message-Id: <1499086338-19498-3-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499086338-19498-1-git-send-email-kgunda@codeaurora.org> References: <1499086338-19498-1-git-send-email-kgunda@codeaurora.org> 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 If "core" memory resource is not specified, then the driver could end up dereferencing a null pointer. Fix this issue. Signed-off-by: Kiran Gunda Reviewed-by: Stephen Boyd --- drivers/spmi/spmi-pmic-arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index f1851cb..86affb0 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -964,14 +964,14 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) pmic_arb->spmic = ctrl; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); - pmic_arb->core_size = resource_size(res); - core = devm_ioremap_resource(&ctrl->dev, res); if (IS_ERR(core)) { err = PTR_ERR(core); goto err_put_ctrl; } + pmic_arb->core_size = resource_size(res); + pmic_arb->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, sizeof(*pmic_arb->ppid_to_apid), GFP_KERNEL);