From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kiran Gunda Subject: [PATCH V2 2/4] spmi: pmic-arb: fix a possible null pointer dereference Date: Mon, 10 Jul 2017 18:35:24 +0530 Message-ID: <1499691926-16030-3-git-send-email-kgunda@codeaurora.org> References: <1499691926-16030-1-git-send-email-kgunda@codeaurora.org> Return-path: In-Reply-To: <1499691926-16030-1-git-send-email-kgunda@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org To: gregkh@linuxfoundation.org, sboyd@codeaurora.org, Kiran Gunda , Abhijeet Dharmapurikar , David Collins , linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org 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 4853758..c7b54a6 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -956,14 +956,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); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project