thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 11 Mar 2015 09:36:07 +0000 (12:36 +0300)
committerDarren Hart <dvhart@linux.intel.com>
Sat, 14 Mar 2015 19:00:19 +0000 (12:00 -0700)
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: 6a68d8557084 ('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>
drivers/platform/x86/thinkpad_acpi.c

index 024861db15871fe8cf70fbbe898a5e1b2c9cbfb8..7769575345d89f6ed4b3efc8068258104291bdfb 100644 (file)
@@ -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;