Commit 741d98c7 authored Mar 11, 2015 by Dan Carpenter Committed by Darren Hart Mar 14, 2015

thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()



This should be >= instead of > because otherwise we read one element
past the end of the hotkey_keycode_map[] array.

The hotkey_keycode_map[] array has TPACPI_HOTKEY_MAP_LEN elements.

Fixes: 6a68d855 ('thinkpad_acpi: Add support for more adaptive kbd buttons')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-By: Bastien Nocera <hadess@hadess.net>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>

parent abf9dc0d

drivers/platform/x86/thinkpad_acpi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -3656,8 +3656,9 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
		return true;

		default:
		if (scancode < FIRST_ADAPTIVE_KEY \|\| scancode > FIRST_ADAPTIVE_KEY +
		TPACPI_HOTKEY_MAP_LEN - ADAPTIVE_KEY_OFFSET) {
		if (scancode < FIRST_ADAPTIVE_KEY \|\|
		scancode >= FIRST_ADAPTIVE_KEY + TPACPI_HOTKEY_MAP_LEN -
		ADAPTIVE_KEY_OFFSET) {
		pr_info("Unhandled adaptive keyboard key: 0x%x\n",
		scancode);
		return false;