]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
tty/vt/keyboard: fix OOB access in do_compute_shiftstate()
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 27 Jun 2016 21:12:34 +0000 (14:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jul 2016 16:55:51 +0000 (09:55 -0700)
commite55e3853f21406d190b4eb54a928345446660aa0
treef2efb610a7405ff4108f6811126d2594e81bb35b
parent93756932e0d49180a56edf56fd8cfb635eae6845
tty/vt/keyboard: fix OOB access in do_compute_shiftstate()

commit 510cccb5b0c8868a2b302a0ab524da7912da648b upstream.

The size of individual keymap in drivers/tty/vt/keyboard.c is NR_KEYS,
which is currently 256, whereas number of keys/buttons in input device (and
therefor in key_down) is much larger - KEY_CNT - 768, and that can cause
out-of-bound access when we do

sym = U(key_maps[0][k]);

with large 'k'.

To fix it we should not attempt iterating beyond smaller of NR_KEYS and
KEY_CNT.

Also while at it let's switch to for_each_set_bit() instead of open-coding
it.

Reported-by: Sasha Levin <sasha.levin@oracle.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/keyboard.c