summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2005-07-24 07:50:03 +0200
committerDmitry Torokhov <dtor_core@ameritech.net>2005-07-24 07:50:03 +0200
commit5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe (patch)
tree5c8e25dc2797cb0e063c38afda2dbbf292e34bd3 /drivers/input
parentInput: i8042 - don't use negation to mark AUX data (diff)
downloadlinux-5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe.tar.xz
linux-5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe.zip
Input: check keycodesize when adjusting keymaps
When changing key mappings we need to make sure that the new keycode value can be stored in dev->keycodesize bytes. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/evdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 374f404e81da..20e3a165989f 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -320,6 +320,7 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (t < 0 || t >= dev->keycodemax || !dev->keycodesize) return -EINVAL;
if (get_user(v, ip + 1)) return -EFAULT;
if (v < 0 || v > KEY_MAX) return -EINVAL;
+ if (v >> (dev->keycodesize * 8)) return -EINVAL;
u = SET_INPUT_KEYCODE(dev, t, v);
clear_bit(u, dev->keybit);
set_bit(v, dev->keybit);