input: Return the number of bytes written so far on evdev write failure
Subsystems (2)
PATCH 1/2 input: Return the number of bytes written so far on evdev write failure
If input_event_from_user() fails in evdev write() and at least one event has been written successfully then return the number of bytes written. If no events have been written, then the EFAULT error is returned.
--- drivers/input/evdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/evdev.c +2 -1
@@ -437,7 +437,8 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,while (retval +input_event_size () <= count) {if (input_event_from_user (buffer + retval, &event)) { - retval = -EFAULT ; +if (retval ==0 ) + retval = -EFAULT ; goto out; } retval +=input_event_size ();
Signature · 1 line
1.7.9.7
PATCH 2/2 uinput: Support injecting multiple events in one write() call
Rework the code in uinput_inject_event so that it matches the code in evdev_write and allows injecting more than one event, or zero events.
--- drivers/input/misc/uinput.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/input/misc/uinput.c +13 -5
@@ -434,16 +434,24 @@ static ssize_t uinput_inject_event(struct uinput_device *udev, const char __user *buffer, size_t count) {struct input_event ev; +size_t bytes =0 ; -if (count <input_event_size ()) +if (count !=0 && count <input_event_size ())return -EINVAL ; -if (input_event_from_user (buffer, &ev)) -return -EFAULT ; +while (bytes +input_event_size () <= count) { +if (input_event_from_user (buffer + bytes, &ev)) { +if (!bytes) + bytes = -EFAULT ; + goto out; + } -input_event (udev->dev, ev.type, ev.code, ev.value); +input_event (udev->dev, ev.type, ev.code, ev.value); + bytes +=input_event_size (); + } -return input_event_size (); + out: +return bytes; } static ssize_t uinput_write(struct file *file, const char __user *buffer,
Signature · 1 line
1.7.9.7
Dmitry Torokhov
maintainerRe: [PATCH 2/2] uinput: Support injecting multiple events in one write() call
Hi Ryan,
Quoted 2 lines · Ryan Mallon
Rework the code in
uinput_inject_eventso that it matches the code inevdev_writeand allows injecting more than one event, or zero events.
After some thinking I went back to the original version of your patch. For justification see 46f49b7a223ac7493e7cf619fb583d11edefc2c2:
"When copy_to/from_user fails in the middle of transfer we should not report to the user that read/write partially succeeded but rather report -EFAULT right away, so that application will know that it got its buffers all wrong.
If application messed up its buffers we can't trust the data fetched from userspace and successfully written to the device or if data read from the device and transferred to userspace ended up where application expected it to end."
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH 2/2] uinput: Support injecting multiple events in one write() call
Quoted 14 lines · Dmitry Torokhov
Hi Ryan,
Quoted 2 lines · Ryan Mallon
Rework the code in
uinput_inject_eventso that it matches the code inevdev_writeand allows injecting more than one event, or zero events.After some thinking I went back to the original version of your patch. For justification see
46f49b7a223ac7493e7cf619fb583d11edefc2c2:"When copy_to/from_user fails in the middle of transfer we should not report to the user that read/write partially succeeded but rather report
-EFAULTright away, so that application will know that it got its buffers all wrong.
Quoted 4 lines
If application messed up its buffers we can't trust the data fetched from userspace and successfully written to the device or if data read from the device and transferred to userspace ended up where application expected it to end."
Okay, so patch 1 is obviously dropped. Do you want me to resend a fixed version of this one, or have you already modified it?
Thanks,
~Ryan
Dmitry Torokhov
maintainerRe: [PATCH 2/2] uinput: Support injecting multiple events in one write() call
Quoted 22 lines · Ryan Mallon
Quoted 4 lines · Dmitry Torokhov
Hi Ryan,
Quoted 1 line · Ryan Mallon
Rework the code in
uinput_inject_eventso that it matches the codein
Quoted 1 line
Quoted 1 line
evdev_writeand allows injecting more than one event, or zeroevents.
Quoted 2 lines
After some thinking I went back to the original version of your
patch.
Quoted 10 lines
For justification see
46f49b7a223ac7493e7cf619fb583d11edefc2c2:"When copy_to/from_user fails in the middle of transfer we should not report to the user that read/write partially succeeded but rather report
-EFAULTright away, so that application will know that it got its buffers all wrong.If application messed up its buffers we can't trust the data fetched from userspace and successfully written to the device or if data read from the device and transferred to userspace ended up where
Quoted 7 lines
application
Quoted 1 line
expected it to end."
Okay, so patch 1 is obviously dropped. Do you want me to resend a fixed
version of this one, or have you already modified it?
I took your original version - is does the right thing.
Thanks.
Signature · 1 line
Dmitry