On Wed, 2015-03-11 at 12:36 +0300, Dan Carpenter wrote: > 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@xxxxxxxxxx> Acked-By: Bastien Nocera <hadess@xxxxxxxxxx> > diff --git a/drivers/platform/x86/thinkpad_acpi.c > b/drivers/platform/x86/thinkpad_acpi.c > index 024861d..7769575 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -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; ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ ibm-acpi-devel mailing list ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel