From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71B8AC33CB3 for ; Tue, 14 Jan 2020 10:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3648C207FF for ; Tue, 14 Jan 2020 10:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996865; bh=y3hojQXEA8XV+d/pNvuWwQg0+T/RPwpbZaLgU7memec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m8xzMReEvkd07Q/OahQCEXiBIBYwoOqC+jscakHg9Z1KkFceYyrbUd7yLyL9BPavT Cu0Sj5rgXk+1tR8dhwTPo9OX9sUHF5VgTIFpxIu72XRkPm/H6T72dMkAP7npcI8vgz 1BDSBIua9HIYk5D4KkmcLtpC1AzbYXTgY+fqBx7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731337AbgANKMq (ORCPT ); Tue, 14 Jan 2020 05:12:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:49426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733104AbgANKMp (ORCPT ); Tue, 14 Jan 2020 05:12:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E89DF207FF; Tue, 14 Jan 2020 10:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996765; bh=y3hojQXEA8XV+d/pNvuWwQg0+T/RPwpbZaLgU7memec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0EtPfJSRN7mWsGIf3ZcxEcMEWkR0lybkoeTQ0oIhlSdwXdTFzO190ZZGN25+uZ/3 I+aWlNmZ8f6661hlvrrlyZ2emQg5HmGQdmQ0/GLhlGIQ2gpXEgs1MOWZUUqUjnX/PG u5aY1qjc4pF8t9pWKvcRgizDaDZtI2byl9uFGaBc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcel Holtmann , Jiri Kosina Subject: [PATCH 4.4 08/28] HID: uhid: Fix returning EPOLLOUT from uhid_char_poll Date: Tue, 14 Jan 2020 11:02:10 +0100 Message-Id: <20200114094341.152658288@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094336.845958665@linuxfoundation.org> References: <20200114094336.845958665@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marcel Holtmann 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 Cc: stable@vger.kernel.org Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/uhid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c @@ -26,6 +26,7 @@ #include #include #include +#include #define UHID_NAME "uhid" #define UHID_BUFSIZE 32 @@ -774,7 +775,7 @@ static unsigned int uhid_char_poll(struc if (uhid->head != uhid->tail) return POLLIN | POLLRDNORM; - return 0; + return EPOLLOUT | EPOLLWRNORM; } static const struct file_operations uhid_fops = {