HID: debug: fix error handling in hid_debug_events_read()
authorJiri Kosina <jkosina@suse.cz>
Thu, 9 Apr 2015 11:32:35 +0000 (13:32 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 10 Apr 2015 15:32:21 +0000 (17:32 +0200)
In the unlikely case of hdev vanishing while hid_debug_events_read() was
sleeping, we can't really break out of the case switch as with other cases,
as on the way out we'll try to remove ourselves from the hdev waitqueue.

Fix this by taking a shortcut exit path and avoiding cleanup that doesn't
make sense in case hdev doesn't exist any more anyway.

Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-debug.c

index 8bf61d295ffd7efd638e1f14570508e9c8498f50..f5021fb3b67439c7b7afbdee63f939bba0b200e2 100644 (file)
@@ -1127,7 +1127,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
 
                                if (!list->hdev || !list->hdev->debug) {
                                        ret = -EIO;
-                                       break;
+                                       set_current_state(TASK_RUNNING);
+                                       goto out;
                                }
 
                                /* allow O_NONBLOCK from other threads */