From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Jeff LaBundy" <jeff@labundy.com>,
"Tomasz Moń" <tomasz.mon@camlingroup.com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Sasha Levin" <sashal@kernel.org>,
linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 04/11] Input: add bounds checking to input_set_capability()
Date: Wed, 6 Apr 2022 21:16:01 -0400 [thread overview]
Message-ID: <20220407011609.115258-4-sashal@kernel.org> (raw)
In-Reply-To: <20220407011609.115258-1-sashal@kernel.org>
From: Jeff LaBundy <jeff@labundy.com>
[ Upstream commit 409353cbe9fe48f6bc196114c442b1cff05a39bc ]
Update input_set_capability() to prevent kernel panic in case the
event code exceeds the bitmap for the given event type.
Suggested-by: Tomasz Moń <tomasz.mon@camlingroup.com>
Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Tomasz Moń <tomasz.mon@camlingroup.com>
Link: https://lore.kernel.org/r/20220320032537.545250-1-jeff@labundy.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/input.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index b031174c8d7f..c803d000d320 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -50,6 +50,17 @@ static DEFINE_MUTEX(input_mutex);
static const struct input_value input_value_sync = { EV_SYN, SYN_REPORT, 1 };
+static const unsigned int input_max_code[EV_CNT] = {
+ [EV_KEY] = KEY_MAX,
+ [EV_REL] = REL_MAX,
+ [EV_ABS] = ABS_MAX,
+ [EV_MSC] = MSC_MAX,
+ [EV_SW] = SW_MAX,
+ [EV_LED] = LED_MAX,
+ [EV_SND] = SND_MAX,
+ [EV_FF] = FF_MAX,
+};
+
static inline int is_event_supported(unsigned int code,
unsigned long *bm, unsigned int max)
{
@@ -1915,6 +1926,14 @@ EXPORT_SYMBOL(input_free_device);
*/
void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code)
{
+ if (type < EV_CNT && input_max_code[type] &&
+ code > input_max_code[type]) {
+ pr_err("%s: invalid code %u for type %u\n", __func__, code,
+ type);
+ dump_stack();
+ return;
+ }
+
switch (type) {
case EV_KEY:
__set_bit(code, dev->keybit);
--
2.35.1
next prev parent reply other threads:[~2022-04-07 1:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 1:15 [PATCH AUTOSEL 4.19 01/11] gfs2: assign rgrp glock before compute_bitstructs Sasha Levin
2022-04-07 1:15 ` [PATCH AUTOSEL 4.19 02/11] um: Cleanup syscall_handler_t definition/cast, fix warning Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 03/11] um: port_user: Improve error handling when port-helper is not found Sasha Levin
2022-04-07 1:16 ` Sasha Levin [this message]
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 05/11] Input: stmfts - fix reference leak in stmfts_input_open Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 06/11] crypto: stm32 - fix reference leak in stm32_crc_remove Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 07/11] MIPS: lantiq: check the return value of kzalloc() Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 08/11] drbd: remove usage of list iterator variable after loop Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 09/11] ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame() Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 10/11] nilfs2: fix lockdep warnings in page operations for btree nodes Sasha Levin
2022-04-07 1:16 ` [PATCH AUTOSEL 4.19 11/11] nilfs2: fix lockdep warnings during disk space reclamation Sasha Levin
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=20220407011609.115258-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=jeff@labundy.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tomasz.mon@camlingroup.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