BugLink: http://bugs.launchpad.net/bugs/658198

Backported from de391d12500ede13faa7ecadbe900a8de1f76cfa
by Tim Gardner <tim.gardner@canonical.com>

Check the input_keymap_entry keycode size (u32) instead of the device's
(void*) when validating that keycode value can be stored in the keymap.

Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=22722

Signed-off-by: Mattia Dongili <malattia@linux.it>
Tested-by: Norbert Preining <preining@logic.at>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
drivers/input/input.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/input.c b/drivers/input/input.c
index e6395bf..577a40a 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -681,7 +681,7 @@ static int input_default_setkeycode(struct input_dev *dev,
if (!dev->keycodesize)
return -EINVAL;

- if (dev->keycodesize < sizeof(dev->keycode) &&
+ if (dev->keycodesize < sizeof(kt_entry->keycode) &&
(kt_entry->keycode >> (dev->keycodesize * 8)))
return -EINVAL;

--
1.7.0.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team