Commit 5ac7ba3f authored Jul 24, 2005 by Vojtech Pavlik Committed by Dmitry Torokhov Jul 24, 2005

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>

parent 463a4f76

drivers/char/keyboard.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

drivers/input/evdev.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);