From: Sasha Levin <sashal@kernel.org>
Date: Tue, 27 Dec 2022 13:59:07 +0000 (-0500)
Subject: Fixes for 6.0
X-Git-Tag: v5.15.86~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd7bdc061b1f19a64214d509ac5b9164d8ad45f;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 6.0

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-6.0/input-iqs7222-avoid-sending-empty-syn_report-events.patch b/queue-6.0/input-iqs7222-avoid-sending-empty-syn_report-events.patch
new file mode 100644
index 00000000000..7a28328a420
--- /dev/null
+++ b/queue-6.0/input-iqs7222-avoid-sending-empty-syn_report-events.patch
@@ -0,0 +1,38 @@
+From 16a321dfb35e4d18a638777ebdfbd45ee43c2eae Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 8 Sep 2022 14:24:24 -0700
+Subject: Input: iqs7222 - avoid sending empty SYN_REPORT events
+
+From: Jeff LaBundy <jeff@labundy.com>
+
+[ Upstream commit 514c13b1faed74e9bc19061b6d7c78d53a3402ba ]
+
+Add a check to prevent sending undefined events, which ultimately
+map to SYN_REPORT.
+
+Fixes: e505edaedcb9 ("Input: add support for Azoteq IQS7222A/B/C")
+Signed-off-by: Jeff LaBundy <jeff@labundy.com>
+Link: https://lore.kernel.org/r/20220908131548.48120-7-jeff@labundy.com
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/input/misc/iqs7222.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/input/misc/iqs7222.c b/drivers/input/misc/iqs7222.c
+index 8fd665874a24..0b2bf471b3a0 100644
+--- a/drivers/input/misc/iqs7222.c
++++ b/drivers/input/misc/iqs7222.c
+@@ -2314,6 +2314,9 @@ static int iqs7222_report(struct iqs7222_private *iqs7222)
+ 			int k = 2 + j * (num_chan > 16 ? 2 : 1);
+ 			u16 state = le16_to_cpu(status[k + i / 16]);
+ 
++			if (!iqs7222->kp_type[i][j])
++				continue;
++
+ 			input_event(iqs7222->keypad,
+ 				    iqs7222->kp_type[i][j],
+ 				    iqs7222->kp_code[i][j],
+-- 
+2.35.1
+
diff --git a/queue-6.0/series b/queue-6.0/series
index 15022a47ddf..dbf20c0676e 100644
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -1019,3 +1019,4 @@ perf-test-fix-all-pmu-test-to-skip-parametrized-even.patch
 afs-fix-lost-servers_outstanding-count.patch
 pstore-make-sure-config_pstore_pmsg-selects-config_r.patch
 ima-simplify-ima_lsm_copy_rule.patch
+input-iqs7222-avoid-sending-empty-syn_report-events.patch