Skip to content

Commit fbed129

Browse files
Tzung-Bi ShihUlrich Hecht
authored andcommitted
Input: cros_ec_keyb - fix an invalid memory access
commit e08969c4d65ac31297fcb4d31d4808c789152f68 upstream. If cros_ec_keyb_register_matrix() isn't called (due to `buttons_switches_only`) in cros_ec_keyb_probe(), `ckdev->idev` remains NULL. An invalid memory access is observed in cros_ec_keyb_process() when receiving an EC_MKBP_EVENT_KEY_MATRIX event in cros_ec_keyb_work() in such case. Unable to handle kernel read from unreadable memory at virtual address 0000000000000028 ... x3 : 0000000000000000 x2 : 0000000000000000 x1 : 0000000000000000 x0 : 0000000000000000 Call trace: input_event cros_ec_keyb_work blocking_notifier_call_chain ec_irq_thread It's still unknown about why the kernel receives such malformed event, in any cases, the kernel shouldn't access `ckdev->idev` and friends if the driver doesn't intend to initialize them. Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Link: https://patch.msgid.link/20251104070310.3212712-1-tzungbi@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent 58e453e commit fbed129

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/input/keyboard/cros_ec_keyb.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,12 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
242242
case EC_MKBP_EVENT_KEY_MATRIX:
243243
pm_wakeup_event(ckdev->dev, 0);
244244

245+
if (!ckdev->idev) {
246+
dev_warn_once(ckdev->dev,
247+
"Unexpected key matrix event\n");
248+
return NOTIFY_OK;
249+
}
250+
245251
if (ckdev->ec->event_size != ckdev->cols) {
246252
dev_err(ckdev->dev,
247253
"Discarded incomplete key matrix event.\n");

0 commit comments

Comments
 (0)