2005-05-25 12:27:04

by Ian Campbell

Subject: [UINPUT] Allow EV_ABS to work in uinput.c

Hi,

uinput_alloc_device() is supposed to return the number of bytes read,
the value is returned to uinput_write() and from there to userspace. If
EV_ABS is set then it returns the value from uinput_validate_absbits()
instead, which is zero when everything is ok instead of the count.

Signed-off-by: Ian Campbell <[email protected]>

%patch
Index: 2.6/drivers/input/misc/uinput.c
===================================================================
--- 2.6.orig/drivers/input/misc/uinput.c 2005-05-25 10:45:56.000000000 +0100
+++ 2.6/drivers/input/misc/uinput.c 2005-05-25 10:47:02.000000000 +0100
@@ -216,9 +216,11 @@
/* check if absmin/absmax/absfuzz/absflat are filled as
* told in Documentation/input/input-programming.txt */
if (test_bit(EV_ABS, dev->evbit)) {
- retval = uinput_validate_absbits(dev);
- if (retval < 0)
+ int err = uinput_validate_absbits(dev);
+ if (err < 0) {
+ retval = err;
kfree(dev->name);
+ }
}

exit:


--
Ian Campbell, Senior Design Engineer
Web: http://www.arcom.com
Arcom, Clifton Road, Direct: +44 (0)1223 403 465
Cambridge CB1 7EA, United Kingdom Phone: +44 (0)1223 411 200

2005-05-25 12:36:31

by Aristeu Sergio Rozanski Filho

Subject: Re: [UINPUT] Allow EV_ABS to work in uinput.c

> uinput_alloc_device() is supposed to return the number of bytes read,
> the value is returned to uinput_write() and from there to userspace. If
> EV_ABS is set then it returns the value from uinput_validate_absbits()
> instead, which is zero when everything is ok instead of the count.
>
> Signed-off-by: Ian Campbell <[email protected]>
Acked-by: Aristeu Rozanski <[email protected]>

> --- 2.6.orig/drivers/input/misc/uinput.c 2005-05-25 10:45:56.000000000 +0100
> +++ 2.6/drivers/input/misc/uinput.c 2005-05-25 10:47:02.000000000 +0100
> @@ -216,9 +216,11 @@
> /* check if absmin/absmax/absfuzz/absflat are filled as
> * told in Documentation/input/input-programming.txt */
> if (test_bit(EV_ABS, dev->evbit)) {
> - retval = uinput_validate_absbits(dev);
> - if (retval < 0)
> + int err = uinput_validate_absbits(dev);
> + if (err < 0) {
> + retval = err;
> kfree(dev->name);
> + }
> }
>
> exit:

--
Aristeu

2005-05-31 14:34:01

by Vojtech Pavlik

Subject: Re: [UINPUT] Allow EV_ABS to work in uinput.c

On Wed, May 25, 2005 at 09:36:26AM -0300, Aristeu Sergio Rozanski Filho wrote:
> > uinput_alloc_device() is supposed to return the number of bytes read,
> > the value is returned to uinput_write() and from there to userspace. If
> > EV_ABS is set then it returns the value from uinput_validate_absbits()
> > instead, which is zero when everything is ok instead of the count.
> >
> > Signed-off-by: Ian Campbell <[email protected]>
> Acked-by: Aristeu Rozanski <[email protected]>

Thanks; added to my tree.

> > --- 2.6.orig/drivers/input/misc/uinput.c 2005-05-25 10:45:56.000000000 +0100
> > +++ 2.6/drivers/input/misc/uinput.c 2005-05-25 10:47:02.000000000 +0100
> > @@ -216,9 +216,11 @@
> > /* check if absmin/absmax/absfuzz/absflat are filled as
> > * told in Documentation/input/input-programming.txt */
> > if (test_bit(EV_ABS, dev->evbit)) {
> > - retval = uinput_validate_absbits(dev);
> > - if (retval < 0)
> > + int err = uinput_validate_absbits(dev);
> > + if (err < 0) {
> > + retval = err;
> > kfree(dev->name);
> > + }
> > }
> >
> > exit:
>
> --
> Aristeu
>
>

--
Vojtech Pavlik
SuSE Labs, SuSE CR