diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-06 16:31:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 16:32:29 -0700 |
| commit | 8e009118a45af30451ff4bbae2b6efd9575d6694 (patch) | |
| tree | 2b5ee42caeaa13d96874ef0003313cb201a0de75 /drivers/input/misc | |
| parent | Input: ad7877 - convert to using timer_setup() (diff) | |
| download | linux-dev-8e009118a45af30451ff4bbae2b6efd9575d6694.tar.xz linux-dev-8e009118a45af30451ff4bbae2b6efd9575d6694.zip | |
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>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/uinput.c | 6 |
1 files changed, 5 insertions, 1 deletions
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: |