]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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 Slaby <jslaby@suse.cz>
Tue, 26 May 2015 14:26:56 +0000 (16:26 +0200)
commit 8fec02a73e31407e14986fca67dab48d4f777f0e upstream.

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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/hid/hid-debug.c

index 8453214ec3767d6c55aefe2bb99466d426904403..c607d953270c5e65f18a037720a7933dca33ca23 100644 (file)
@@ -1027,7 +1027,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 */