Skip to content

Commit

Permalink
Input: uinput - don't use "interruptible" in FF code
Browse files Browse the repository at this point in the history
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: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Nov 20, 2005
1 parent 59c7c03 commit e597f0c
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/input/misc/uinput.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,19 @@ static void uinput_request_done(struct uinput_device *udev, struct uinput_reques
{
/* Mark slot as available */
udev->requests[request->id] = NULL;
wake_up_interruptible(&udev->requests_waitq);
wake_up(&udev->requests_waitq);

complete(&request->done);
}

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 */
uinput_dev_event(dev, EV_UINPUT, request->code, request->id);

/* Wait for the request to complete */
retval = wait_for_completion_interruptible(&request->done);
if (!retval)
retval = request->retval;

return retval;
wait_for_completion(&request->done);
return request->retval;
}

static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect)
Expand Down

0 comments on commit e597f0c

Please sign in to comment.