aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Dongili <malattia@linux.it>2010-11-18 09:06:43 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-11-18 09:20:42 -0800
commitde391d12500ede13faa7ecadbe900a8de1f76cfa (patch)
tree1eead92192ccd11aebe5b734767aebfeed5dd258
parent6f07d31e46639e4b1b23de6ee88c9e079a7bf32d (diff)
downloadmrst-s0i3-test-de391d12500ede13faa7ecadbe900a8de1f76cfa.tar.gz
mrst-s0i3-test-de391d12500ede13faa7ecadbe900a8de1f76cfa.tar.xz
mrst-s0i3-test-de391d12500ede13faa7ecadbe900a8de1f76cfa.zip
Input: fix typo in keycode validation supporting large scancodes
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>
-rw-r--r--drivers/input/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 7f26ca6ecf7..5edc41aa08f 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -753,7 +753,7 @@ static int input_default_setkeycode(struct input_dev *dev,
if (index >= dev->keycodemax)
return -EINVAL;
- if (dev->keycodesize < sizeof(dev->keycode) &&
+ if (dev->keycodesize < sizeof(ke->keycode) &&
(ke->keycode >> (dev->keycodesize * 8)))
return -EINVAL;