Commit b0579fc0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: evdev - fix EVIOCSABS regression
  Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS
parents 7f81c56c f9ce6eb5

drivers/input/evdev.c

+7 −1
Original line number Diff line number Diff line
@@ -669,6 +669,9 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 


		if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) {



			if (!dev->absinfo)

				return -EINVAL;



			t = _IOC_NR(cmd) & ABS_MAX;

			abs = dev->absinfo[t];
@@ -680,10 +683,13 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
		}

	}



	if (_IOC_DIR(cmd) == _IOC_READ) {

	if (_IOC_DIR(cmd) == _IOC_WRITE) {



		if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {



			if (!dev->absinfo)

				return -EINVAL;



			t = _IOC_NR(cmd) & ABS_MAX;



			if (copy_from_user(&abs, p, min_t(size_t,