]> www.infradead.org Git - users/jedix/linux-maple.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)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:05 +0000 (17:22 -0500)
commit9f4f439c4db1cfdb28bf5803d6f2edc24dfda3f7
treecc7b48d6a567b148f9197dd10d7ded55574bffa7
parent2455438009a886982b72baa0d6a6cf23bb6af359
tty/vt/keyboard: fix OOB access in do_compute_shiftstate()

Orabug: 25308109

[ Upstream commit 510cccb5b0c8868a2b302a0ab524da7912da648b ]

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>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit 9524cc41374df87b9c8d200e3561ad408bfa5844)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/tty/vt/keyboard.c