]> 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:03:02 +0000 (20:03 +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 f6863adc15ad4f5e109391e5d78d25273155005b..ea0c860ee842460563b0fc2e57515a6fe180f9af 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/uhid.h>
 #include <linux/wait.h>
 #include <linux/uaccess.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 = {