Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1605121ybh; Mon, 20 Jul 2020 02:37:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIeumKSNvHZYE6XBcoEjZLmtd116Cv6fbSfD9mw2z1xEXtf8RPe1V0zI9TOnEB0egNwcOa X-Received: by 2002:a17:906:a449:: with SMTP id cb9mr19261755ejb.115.1595237840365; Mon, 20 Jul 2020 02:37:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595237840; cv=none; d=google.com; s=arc-20160816; b=LbrIoJ9il6jIc4/IxRh+hsc6IiJg0vqZvQJC4SDY4cNuC8I9gsZfz4gVSAwOJX2ixJ O3y+MsrWKLGLa1oVTMm2/UAdwW/HyYERCk+BBVTgMsSotJ3eChiTPbvaAdzIAjXH7V2E qGPlBBSjW8oLReYmSy4OJrQb40q0PbKt7ZD9Bf/R47PWPwc1TpXyOdAiOi7luCewkqTA 9JhBaP5SwOU8o2c2cJ1uoA9wt/k7pSSsiMvAKEVwvhohtzlNjrG5+9adISeZuI2zejX6 yYvifjgI0WtVtClCWx+UX+jpaDuTUOjBUCBJEFQXZTc2tj6Ny/g2QZbY6uDklzXeFH1k 5soQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature; bh=cACEREbxrJ/DDWSn6xtrrfWGjDlLHFv8rEqkvGRBTw4=; b=L959OUYS8aUCPPBrlwd0ztZszxSdF6V9oqybeZOhdJhZ1tTci4oI8jaOkkbXE6hBLr 8VA06doZJAnJXUsfnImlPWMtFMEOoRmoEMTIfm0AT7p1VcJRYG6RT+fHLp4sNlZhrpQF yLk1FIy4HqdR6jzAY3DDGR0tYKu5h+8HFPdTr9NQMhfOpwY+rv4NyouXjrYjw8YDNBrH aYIgLwAwQUnBJLzbQkfz/yNSm/V/xtrPL+CgzQUSlQMHJluif/rydkylPykDkPGB4E+c 1NOTO6dwGRwBqUvxJ/89PTxNq9fI5EYfK8ZBquWS8FkIx+rQazWQuodsa6CJQlRelg98 E2XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=ewFWwtCo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g7si9495189ejr.748.2020.07.20.02.36.57; Mon, 20 Jul 2020 02:37:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=ewFWwtCo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728253AbgGTJgZ (ORCPT + 99 others); Mon, 20 Jul 2020 05:36:25 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:20853 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728248AbgGTJgY (ORCPT ); Mon, 20 Jul 2020 05:36:24 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1595237783; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=cACEREbxrJ/DDWSn6xtrrfWGjDlLHFv8rEqkvGRBTw4=; b=ewFWwtCod0NQ+mbTf/JoMct1edPWlpUZwxQrP/eO7iqCkjp15o+VaKMux+Xr6adpEkhysevE VkyW1Y0yYluqWWXXGyn0wl3cT3Gb5tTEBNoreqVZpvSiUwSc+ryABDcd6idkB2LxPAi3l+1f emQJIjKeQwSJIs57DbemQpTYfIA= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 5f1565970cb8533c3b7a52c8 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 20 Jul 2020 09:36:23 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id A4E93C433A0; Mon, 20 Jul 2020 09:36:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from akashast-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akashast) by smtp.codeaurora.org (Postfix) with ESMTPSA id C78CCC433C6; Mon, 20 Jul 2020 09:36:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C78CCC433C6 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=akashast@codeaurora.org From: Akash Asthana To: bjorn.andersson@linaro.org Cc: mka@chromium.org, linux-kernel@vger.kernel.org, saipraka@codeaurora.org, msavaliy@codeaurora.org, linux-arm-msm@vger.kernel.org, Akash Asthana Subject: [PATCH V2] soc: qcom: geni: Fix NULL pointer dereference Date: Mon, 20 Jul 2020 15:06:02 +0530 Message-Id: <1595237762-6776-1-git-send-email-akashast@codeaurora.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org pdev struct doesn't exists for the devices whose status are disabled from DT node, in such cases NULL is returned from 'of_find_device_by_node' Later when we try to get drvdata from pdev struct NULL pointer dereference is triggered. Add a NULL check for return values to fix the issue. We were hitting this issue when one of QUP is disabled. Fixes: 048eb908a1f2 ("soc: qcom-geni-se: Add interconnect support to fix earlycon crash") Reported-by: Sai Prakash Ranjan Reviewed-by: Matthias Kaehlcke Signed-off-by: Akash Asthana --- Changes in V2: - Change variable name 'wrapper_pdev' to 'pdev. drivers/soc/qcom/qcom-geni-se.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c index 355d503..996f20c 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -820,6 +820,7 @@ void geni_remove_earlycon_icc_vote(void) struct geni_wrapper *wrapper; struct device_node *parent; struct device_node *child; + struct platform_device *pdev; if (!earlycon_wrapper) return; @@ -829,7 +830,12 @@ void geni_remove_earlycon_icc_vote(void) for_each_child_of_node(parent, child) { if (!of_device_is_compatible(child, "qcom,geni-se-qup")) continue; - wrapper = platform_get_drvdata(of_find_device_by_node(child)); + + pdev = of_find_device_by_node(child); + if (!pdev) + continue; + + wrapper = platform_get_drvdata(pdev); icc_put(wrapper->to_core.path); wrapper->to_core.path = NULL; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project