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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 142DCC3F68F for ; Wed, 22 Jan 2020 09:30:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4ADA2465B for ; Wed, 22 Jan 2020 09:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685427; bh=o7W4D99RUUOyMLnHzoKuvSoaHllAdLOWgJ1kmK1ffgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vWcx503+2ufDu9kIb9ikwiGBtogH5ck540AkoTM7IBW2xytPeNfK8dw3o3BEHICfJ 0FE7UhB1pqX2i6ivvKEhS55XDb7SWMFUwehDcr5OCnRxiDbfztRtacN5rsxR1rGzO6 YLtCGuqUWFaJMLun0itHMrYajzAPKl2S8yFj0dvU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729050AbgAVJa1 (ORCPT ); Wed, 22 Jan 2020 04:30:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:41760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbgAVJa1 (ORCPT ); Wed, 22 Jan 2020 04:30:27 -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 B449A2465B; Wed, 22 Jan 2020 09:30:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685424; bh=o7W4D99RUUOyMLnHzoKuvSoaHllAdLOWgJ1kmK1ffgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=StnE7Ex89OkxZuT7I5GeNgWUueUpR4p8POxXnP02aCjX/CxjOfiDmM/Al5lvaFWwR 8rACNQXGhNuE54Ifo7C4imrv957CJQJqiN9O6yQuWcJo4kcX4YzRewj4sGUIRTa5g7 B0FsgoVx3VkU6/SEKTQWyj2APzGw8syEz2nQ1U4A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fabian Henneke , Jiri Kosina , Sasha Levin Subject: [PATCH 4.4 01/76] hidraw: Return EPOLLOUT from hidraw_poll Date: Wed, 22 Jan 2020 10:28:17 +0100 Message-Id: <20200122092751.885292472@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore 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: Fabian Henneke [ Upstream commit 378b80370aa1fe50f9c48a3ac8af3e416e73b89f ] Always return EPOLLOUT from hidraw_poll when a device is connected. This is safe since writes are always possible (but will always block). hidraw does not support non-blocking writes and instead always calls blocking backend functions on write requests. Hence, so far, a call to poll never returned EPOLLOUT, which confuses tools like socat. Signed-off-by: Fabian Henneke In-reply-to: Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hidraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 627a24d3ea7c..27d2f5a48a11 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -265,7 +265,7 @@ static unsigned int hidraw_poll(struct file *file, poll_table *wait) poll_wait(file, &list->hidraw->wait, wait); if (list->head != list->tail) - return POLLIN | POLLRDNORM; + return POLLIN | POLLRDNORM | POLLOUT; if (!list->hidraw->exist) return POLLERR | POLLHUP; return 0; -- 2.20.1