From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 6 Sep 2017 23:31:29 +0000 (-0700)
Subject: Input: uinput - allow FF requests to time out
X-Git-Tag: v4.19~15^2~72^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e009118a45af30451ff4bbae2b6efd9575d6694;p=platform%2Fkernel%2Flinux-rpi.git

Input: uinput - allow FF requests to time out

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 <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 443151d..c30704f 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: