]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: uhid: Fix returning EPOLLOUT from uhid_char_poll
authorMarcel Holtmann <marcel@holtmann.org>
Wed, 4 Dec 2019 02:43:55 +0000 (03:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jan 2020 19:05:41 +0000 (20:05 +0100)
commit be54e7461ffdc5809b67d2aeefc1ddc9a91470c7 upstream.

Always return EPOLLOUT from uhid_char_poll to allow polling /dev/uhid
for writable state.

Fixes: 1f9dec1e0164 ("HID: uhid: allow poll()'ing on uhid devices")
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hid/uhid.c

index 6f67d73b184e52814342834c965f181244f6b43a..e63b761f600a222e3ea7c827f9b1b65518162176 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/uhid.h>
 #include <linux/wait.h>
+#include <linux/eventpoll.h>
 
 #define UHID_NAME      "uhid"
 #define UHID_BUFSIZE   32
@@ -774,7 +775,7 @@ static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
        if (uhid->head != uhid->tail)
                return POLLIN | POLLRDNORM;
 
-       return 0;
+       return EPOLLOUT | EPOLLWRNORM;
 }
 
 static const struct file_operations uhid_fops = {