aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-18 13:10:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-18 13:10:08 -0700
commitb0579fc089808b68c53a6a95d043db034468116c (patch)
treef04f256392cec7325664ab6aeaef202c003cc31d
parent7f81c56cf29c0af66a1d0cdbce48441cdaf9fa16 (diff)
parentf9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff)
downloadmrst-s0i3-test-b0579fc089808b68c53a6a95d043db034468116c.tar.gz
mrst-s0i3-test-b0579fc089808b68c53a6a95d043db034468116c.tar.xz
mrst-s0i3-test-b0579fc089808b68c53a6a95d043db034468116c.zip
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
-rw-r--r--drivers/input/evdev.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index c908c5f8364..9ddafc30f43 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -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,