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=ham 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 8FDBEC33CB2 for ; Tue, 14 Jan 2020 10:10:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CB3124677 for ; Tue, 14 Jan 2020 10:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996611; bh=8LOaRDfv1JC2/6WKK98dS6diw/uQ6unHNUNVV/fNm/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZV8ilTmyxgR47hQLj9st/O2q1p2wqjVmTZ1CNOP+FJ1CSZ3DHyylx24cy5+Hv/Wgb GsTZphpvTPkxMywmIzVH1dEAFqvTXLvLOtXs73pjL/tWTpFnc3M1yc8134+zzprEIF 0QRMA5M0E9/q9or9f4Y5FPDgCzvgDzX+/zwZxyqY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731165AbgANKKK (ORCPT ); Tue, 14 Jan 2020 05:10:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:43646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729849AbgANKKH (ORCPT ); Tue, 14 Jan 2020 05:10:07 -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 BCBEE24677; Tue, 14 Jan 2020 10:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996607; bh=8LOaRDfv1JC2/6WKK98dS6diw/uQ6unHNUNVV/fNm/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDNkKm9O6h5D3E++Db77WK8DNe9IijYyOxprQIQcLT3ubdUAbxALxxpmv+lXQD7F3 SaLJ/3NruTUOdbqPCE1YFrNHN4pxZWZ1hZOYta71OQ6g96jgtpVH6688gW7BIcm3Kp 2pO1YyQ7DeHxUS7wAlvrw+Sq9lHXYTepcbetfMm4= 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.14 09/39] HID: uhid: Fix returning EPOLLOUT from uhid_char_poll Date: Tue, 14 Jan 2020 11:01:43 +0100 Message-Id: <20200114094341.250899773@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094336.210038037@linuxfoundation.org> References: <20200114094336.210038037@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 @@ -25,6 +25,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 = {