summaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
authorHillf Danton <hdanton@sina.com>2019-08-06 10:40:15 +0200
committerJiri Kosina <jkosina@suse.cz>2019-08-06 12:42:22 +0200
commit6d4472d7bec39917b54e4e80245784ea5d60ce49 (patch)
tree56698233d5c1d5b4434003f3ff5849a3db94b6c3 /drivers/hid/usbhid
parentHID: hiddev: avoid opening a disconnected device (diff)
downloadlinux-6d4472d7bec39917b54e4e80245784ea5d60ce49.tar.xz
linux-6d4472d7bec39917b54e4e80245784ea5d60ce49.zip
HID: hiddev: do cleanup in failure of opening a device
Undo what we did for opening before releasing the memory slice. Reported-by: syzbot <syzbot+62a1e04fd3ec2abf099e@syzkaller.appspotmail.com> Cc: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Hillf Danton <hdanton@sina.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r--drivers/hid/usbhid/hiddev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index c07df8292380..4e11cc6fc34b 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -308,6 +308,10 @@ bail_normal_power:
hid_hw_power(hid, PM_HINT_NORMAL);
bail_unlock:
mutex_unlock(&hiddev->existancelock);
+
+ spin_lock_irq(&list->hiddev->list_lock);
+ list_del(&list->node);
+ spin_unlock_irq(&list->hiddev->list_lock);
bail:
file->private_data = NULL;
vfree(list);