Currently, uinput_request_submit will only fail if the request wait times out.
However, in other places this wait is interruptable, and in this specific
location it can lead to issues, such as causing system suspend to hang until
the request times out. Since the timeout is so long, this can cause the
appearance of a total system freeze. Making the wait interruptable resolves
this and possibly further issues.
Signed-off-by: Vicki Pfau <vi@xxxxxxxxxxx>
---
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 d98212d55108..0330e72798db 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -183,7 +183,11 @@ static int uinput_request_submit(struct uinput_device *udev,
if (retval)
goto out;
- if (!wait_for_completion_timeout(&request->done, 30 * HZ)) {
+ retval = wait_for_completion_interruptible_timeout(&request->done, 30 * HZ);
+ if (retval == -ERESTARTSYS)
+ goto out;
+
+ if (!retval) {
retval = -ETIMEDOUT;
goto out;
}
--
2.43.0
