From: Denis Arefev <arefev@swemel.ru>
To: Michael Hennerich <michael.hennerich@analog.com>
Cc: "Nuno Sá" <noname.nuno@gmail.com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
lvc-project@linuxtesting.org
Subject: [PATCH 2/2] Input: adp5588-keys Prevent buffer overflow
Date: Fri, 16 May 2025 16:43:04 +0300 [thread overview]
Message-ID: <20250516134313.282564-3-arefev@swemel.ru> (raw)
In-Reply-To: <20250516134313.282564-1-arefev@swemel.ru>
If the value of 'key_val' is less than 1 or greater than 80,
a buffer overflow may occur.
Add a check for valid values 'key_val'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: Denis Arefev <arefev@swemel.ru>
---
drivers/input/keyboard/adp5588-keys.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 13136f863270..91f00d6e2413 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -164,6 +164,9 @@
#define KEY_EV_PRESSED BIT(7)
#define KEY_EV_MASK GENMASK(6, 0)
+#define KEY_EVENT_MIN 1
+#define KEY_EVENT_MAX 80
+
#define KP_SEL(x) (BIT(x) - 1) /* 2^x-1 */
#define KEYP_MAX_EVENT 10
@@ -531,7 +534,7 @@ static void adp5588_report_events(struct adp5588_kpad *kpad, int ev_cnt)
if (key_val >= GPI_PIN_BASE && key_val <= GPI_PIN_END) {
/* gpio line used as IRQ source */
adp5588_gpio_irq_handle(kpad, key_val, key_press);
- } else {
+ } else if (key_val >= KEY_EVENT_MIN && key_val <= KEY_EVENT_MAX) {
int row = (key_val - 1) / ADP5588_COLS_MAX;
int col = (key_val - 1) % ADP5588_COLS_MAX;
int code = MATRIX_SCAN_CODE(row, col, kpad->row_shift);
@@ -542,6 +545,8 @@ static void adp5588_report_events(struct adp5588_kpad *kpad, int ev_cnt)
input_report_key(kpad->input,
kpad->keycode[code], key_press);
+ } else {
+ dev_err_ratelimited(&kpad->client->dev, "invalid report key value %d", key);
}
}
}
--
2.43.0
next prev parent reply other threads:[~2025-05-16 13:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-16 13:43 [PATCH 0/2] Input: adp5588-keys Please correct and add Denis Arefev
2025-05-16 13:43 ` [PATCH 1/2] Input: adp5588-keys Add check on return code Denis Arefev
2025-05-16 13:43 ` Denis Arefev [this message]
2025-05-16 13:47 ` [PATCH 0/2] Input: adp5588-keys Please correct and add Nuno Sá
2025-05-20 11:12 ` Denis Arefev
2025-05-20 11:15 ` Nuno Sá
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=20250516134313.282564-3-arefev@swemel.ru \
--to=arefev@swemel.ru \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lvc-project@linuxtesting.org \
--cc=michael.hennerich@analog.com \
--cc=noname.nuno@gmail.com \
/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