tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b0579fc0 7f81c56c

+7 -1
+7 -1
drivers/input/evdev.c
··· 669 669 670 670 if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) { 671 671 672 + if (!dev->absinfo) 673 + return -EINVAL; 674 + 672 675 t = _IOC_NR(cmd) & ABS_MAX; 673 676 abs = dev->absinfo[t]; 674 677 ··· 683 680 } 684 681 } 685 682 686 - if (_IOC_DIR(cmd) == _IOC_READ) { 683 + if (_IOC_DIR(cmd) == _IOC_WRITE) { 687 684 688 685 if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) { 686 + 687 + if (!dev->absinfo) 688 + return -EINVAL; 689 689 690 690 t = _IOC_NR(cmd) & ABS_MAX; 691 691