p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Torokhov 2017-09-06 16:31:29 -07:00
parent 8446b32b06
commit 8e009118a4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/misc/uinput.c
View File

@ -149,7 +149,11 @@ static int uinput_request_submit(struct uinput_device *udev,
if (retval) if (retval)
goto out; goto out;
wait_for_completion(&request->done); if (!wait_for_completion_timeout(&request->done, 30 * HZ)) {
retval = -ETIMEDOUT;
goto out;
}
retval = request->retval; retval = request->retval;
out: out: