From a60d0e8de303395e22093bf438f8e3271265b53b Mon Sep 17 00:00:00 2001 From: Vojtech Pavlik Date: Sun, 24 Jul 2005 00:50:03 -0500 Subject: [PATCH] --- yaml --- r: 5448 b: refs/heads/master c: 5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/keyboard.c | 4 ++-- trunk/drivers/input/evdev.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c272425aa9ee..7e4436fc452e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 463a4f76a79bce00ca8964e0b2ebf7f10f376965 +refs/heads/master: 5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c index 7b19e02f112f..523fd3c8bbaa 100644 --- a/trunk/drivers/char/keyboard.c +++ b/trunk/drivers/char/keyboard.c @@ -198,10 +198,10 @@ int setkeycode(unsigned int scancode, unsigned int keycode) if (scancode >= dev->keycodemax) return -EINVAL; - if (keycode > KEY_MAX) - return -EINVAL; if (keycode < 0 || keycode > KEY_MAX) return -EINVAL; + if (keycode >> (dev->keycodesize * 8)) + return -EINVAL; oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode); diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c index 374f404e81da..20e3a165989f 100644 --- a/trunk/drivers/input/evdev.c +++ b/trunk/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);