Commit e597f0c8 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: uinput - don't use "interruptible" in FF code

If thread that submitted FF request gets interrupted somehow it
will release request structure and ioctl handler will work with
freed memory. TO prevent that from happening switch to using
wait_for_completion instead of wait_for_completion_interruptible.
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 59c7c037
...@@ -92,24 +92,19 @@ static void uinput_request_done(struct uinput_device *udev, struct uinput_reques ...@@ -92,24 +92,19 @@ static void uinput_request_done(struct uinput_device *udev, struct uinput_reques
{ {
/* Mark slot as available */ /* Mark slot as available */
udev->requests[request->id] = NULL; udev->requests[request->id] = NULL;
wake_up_interruptible(&udev->requests_waitq); wake_up(&udev->requests_waitq);
complete(&request->done); complete(&request->done);
} }
static int uinput_request_submit(struct input_dev *dev, struct uinput_request *request) static int uinput_request_submit(struct input_dev *dev, struct uinput_request *request)
{ {
int retval;
/* Tell our userspace app about this new request by queueing an input event */ /* Tell our userspace app about this new request by queueing an input event */
uinput_dev_event(dev, EV_UINPUT, request->code, request->id); uinput_dev_event(dev, EV_UINPUT, request->code, request->id);
/* Wait for the request to complete */ /* Wait for the request to complete */
retval = wait_for_completion_interruptible(&request->done); wait_for_completion(&request->done);
if (!retval) return request->retval;
retval = request->retval;
return retval;
} }
static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect) static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment