From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753609AbdIGAW0 (ORCPT ); Wed, 6 Sep 2017 20:22:26 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33067 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbdIGAVR (ORCPT ); Wed, 6 Sep 2017 20:21:17 -0400 X-Google-Smtp-Source: ADKCNb40AG1oU34XhzfSI6VJal+aqHjx9tmaHCROKNu32euplOkZEQ00eWIMrpOQ/rAM35RIBfSW3Q== From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Rodrigo Rivas Costa , =?UTF-8?q?Cl=C3=A9ment=20VUCHENER?= , Elias Vanderstuyft , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] Input: uinput - allow FF requests to time out Date: Wed, 6 Sep 2017 17:21:09 -0700 Message-Id: <20170907002112.14097-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog In-Reply-To: <20170907002112.14097-1-dmitry.torokhov@gmail.com> References: <20170907002112.14097-1-dmitry.torokhov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Previously uinput force feedback requests waited for the userspace indefinitely, which caused users to block when uinput server process become unresponsive. Let's establish a 30 seconds deadline for servicing upload and erase force feedback effect actions, so that users have a chance to abort stuck requests. Signed-off-by: Dmitry Torokhov --- drivers/input/misc/uinput.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 443151de90c6..c30704fa1a06 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -149,7 +149,11 @@ static int uinput_request_submit(struct uinput_device *udev, if (retval) goto out; - wait_for_completion(&request->done); + if (!wait_for_completion_timeout(&request->done, 30 * HZ)) { + retval = -ETIMEDOUT; + goto out; + } + retval = request->retval; out: -- 2.14.1.581.gf28d330327-goog