From 04809156b59ec9831f4c617f8cf2f839fd330e36 Mon Sep 17 00:00:00 2001 From: David Collins Date: Thu, 28 Jan 2021 15:06:11 -0800 Subject: [PATCH 1/2] input: misc: pm8941-pwrkey: simulate missed key press events The status of the keys connected to the KPDPWR_N and RESIN_N pins is identified by reading corresponding bits in the interrupt real time status register. If the status has changed by the time that the interrupt is handled then a press event will be missed. Maintain a last known status variable to find unbalanced release events and simulate press events for each accordingly. Change-Id: I180469a7048a40e490f21d0f8b9504136131e75b Signed-off-by: David Collins --- drivers/input/misc/pm8941-pwrkey.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c index 7337fe2d759c..bbc506109486 100644 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -78,6 +78,7 @@ struct pm8941_pwrkey { u32 code; u32 sw_debounce_time_us; ktime_t last_release_time; + bool last_status; const struct pm8941_data *data; }; @@ -170,6 +171,16 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data) if (pwrkey->sw_debounce_time_us && !sts) pwrkey->last_release_time = ktime_get(); + /* + * Simulate a press event in case a release event occurred without a + * corresponding press event. + */ + if (!pwrkey->last_status && !sts) { + input_report_key(pwrkey->input, pwrkey->code, 1); + input_sync(pwrkey->input); + } + pwrkey->last_status = sts; + input_report_key(pwrkey->input, pwrkey->code, sts); input_sync(pwrkey->input); From c50741fb590b35aaae25ff7ea2df5be5a5a79e7e Mon Sep 17 00:00:00 2001 From: David Collins Date: Tue, 31 Aug 2021 11:34:27 -0700 Subject: [PATCH 2/2] input: misc: pm8941-pwrkey: avoid potential null pointer dereference 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 --- 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 bbc506109486..54f51a4911ad 100644 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -267,6 +267,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;