linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anjelique Melendez <quic_amelende@quicinc.com>
To: <dmitry.torokhov@gmail.com>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-msm@vger.kernel.org>, <collinsd@codeaurora.org>,
	<bjorn.andersson@linaro.org>, <swboyd@chromium.org>,
	<skakit@codeaurora.org>,
	Anjelique Melendez <quic_amelende@quicinc.com>
Subject: [PATCH 3/3] input: misc: pm8941-pwrkey: avoid potential null pointer dereference
Date: Thu, 20 Jan 2022 12:41:37 -0800	[thread overview]
Message-ID: <20220120204132.17875-4-quic_amelende@quicinc.com> (raw)
In-Reply-To: <20220120204132.17875-1-quic_amelende@quicinc.com>

From: David Collins <collinsd@codeaurora.org>

Add a null check for the pwrkey->data pointer after it is assigned
in pm8941_pwrkey_probe().  This avoids a potential null pointer
dereference when pwrkey->data->has_pon_pbs is accessed later in
the probe function.

Change-Id: I589c4851e544d79a1863fd110b32a0b45ac03caf
Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 drivers/input/misc/pm8941-pwrkey.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index 0ce00736e695..ac08ed025802 100644
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -263,6 +263,10 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 
 	pwrkey->dev = &pdev->dev;
 	pwrkey->data = of_device_get_match_data(&pdev->dev);
+	if (!pwrkey->data) {
+		dev_err(&pdev->dev, "match data not found\n");
+		return -ENODEV;
+	}
 
 	parent = pdev->dev.parent;
 	regmap_node = pdev->dev.of_node;
-- 
2.34.1


  parent reply	other threads:[~2022-01-20 20:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 20:41 [PATCH 0/3] Add support for pm8941-pwrkey.c Anjelique Melendez
2022-01-20 20:41 ` [PATCH 1/3] input: misc: pm8941-pwrkey: add software key press debouncing support Anjelique Melendez
2022-01-21  4:08   ` Stephen Boyd
2022-01-22  0:04     ` Anjelique Melendez
2022-01-24 19:33       ` Stephen Boyd
2022-01-25 19:24         ` Anjelique Melendez
2022-01-20 20:41 ` [PATCH 2/3] input: misc: pm8941-pwrkey: simulate missed key press events Anjelique Melendez
2022-01-20 20:41 ` Anjelique Melendez [this message]
2022-01-20 22:18   ` [PATCH 3/3] input: misc: pm8941-pwrkey: avoid potential null pointer dereference Trilok Soni
2022-01-21  0:15     ` Anjelique Melendez
2022-01-20 23:01   ` Bjorn Andersson
2022-01-21  0:25     ` Anjelique Melendez
2022-01-21  4:18       ` Stephen Boyd
2022-01-24 22:26         ` Bjorn Andersson
2022-01-25  1:55           ` Stephen Boyd
2022-01-25 18:37             ` Bjorn Andersson
2022-01-27 19:51               ` Anjelique Melendez
2022-01-21  3:51 ` [PATCH 0/3] Add support for pm8941-pwrkey.c Stephen Boyd
2022-01-22  0:04   ` Anjelique Melendez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220120204132.17875-4-quic_amelende@quicinc.com \
    --to=quic_amelende@quicinc.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=collinsd@codeaurora.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=skakit@codeaurora.org \
    --cc=swboyd@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).