aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Ospite <ospite@studenti.unina.it>2010-10-05 17:20:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:27:05 -0800
commit67f6b7bedf7981edcf002a1f15344e061cc95ade (patch)
treefe6d9ea89f5d6bd06e6a31bec986aef36c5f4121
parent7cbf7431e259aa462db37fbefc146fbf2a416805 (diff)
HID: hidraw, fix a NULL pointer dereference in hidraw_write
commit e42dee9a99a3ecd32b5c027e8f7411fb5bc11eb6 upstream. BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 IP: [<ffffffffa0f0a625>] hidraw_write+0x3b/0x116 [hid] [...] This is reproducible by disconnecting the device while userspace writes to dev node in a loop and doesn't check return values in order to exit the loop. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/hid/hidraw.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 3b53475a2b3d..66579c0bf328 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -105,11 +105,15 @@ out:
static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
{
unsigned int minor = iminor(file->f_path.dentry->d_inode);
- /* FIXME: What stops hidraw_table going NULL */
- struct hid_device *dev = hidraw_table[minor]->hid;
+ struct hid_device *dev;
__u8 *buf;
int ret = 0;
+ if (!hidraw_table[minor])
+ return -ENODEV;
+
+ dev = hidraw_table[minor]->hid;
+
if (!dev->hid_output_raw_report)
return -ENODEV;