git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
6521d0b
)
Merge branch 'next' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 25 Oct 2010 05:11:17 +0000
(22:11 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 25 Oct 2010 05:11:17 +0000
(22:11 -0700)
drivers/input/evdev.c
patch
|
blob
|
history
diff --git
a/drivers/input/evdev.c
b/drivers/input/evdev.c
index
1ce9bf6
..
b9723c7
100644
(file)
--- a/
drivers/input/evdev.c
+++ b/
drivers/input/evdev.c
@@
-729,6
+729,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];
@@
-740,10
+743,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,