2014-07-19 23:49:20

by Dmitry Torokhov

Subject: [PATCH] Input: fix defuzzing logic

We attempt to remove noise from coordinates reported by devices in
input_handle_abs_event(), unfortunately, unless we were dropping the
event altogether, we were ignoring the adjusted value and were passing
on the original value instead.

Reviewed-by: Andrew de los Reyes <[email protected]>
Reviewed-by: Benson Leung <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/input/input.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1c4c0db..29ca0bb 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -257,9 +257,10 @@ static int input_handle_abs_event(struct input_dev *dev,
}

static int input_get_disposition(struct input_dev *dev,
- unsigned int type, unsigned int code, int value)
+ unsigned int type, unsigned int code, int *pval)
{
int disposition = INPUT_IGNORE_EVENT;
+ int value = *pval;

switch (type) {

@@ -357,6 +358,7 @@ static int input_get_disposition(struct input_dev *dev,
break;
}

+ *pval = value;
return disposition;
}

@@ -365,7 +367,7 @@ static void input_handle_event(struct input_dev *dev,
{
int disposition;

- disposition = input_get_disposition(dev, type, code, value);
+ disposition = input_get_disposition(dev, type, code, &value);

if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
dev->event(dev, type, code, value);

--
Dmitry

2014-07-20 09:50:58

by David Herrmann

Subject: Re: [PATCH] Input: fix defuzzing logic

Hi

On Sun, Jul 20, 2014 at 1:49 AM, Dmitry Torokhov
<[email protected]> wrote:
> We attempt to remove noise from coordinates reported by devices in
> input_handle_abs_event(), unfortunately, unless we were dropping the
> event altogether, we were ignoring the adjusted value and were passing
> on the original value instead.

Reviewed-by: David Herrmann <[email protected]>

Thanks
David

> Reviewed-by: Andrew de los Reyes <[email protected]>
> Reviewed-by: Benson Leung <[email protected]>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
> drivers/input/input.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index 1c4c0db..29ca0bb 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -257,9 +257,10 @@ static int input_handle_abs_event(struct input_dev *dev,
> }
>
> static int input_get_disposition(struct input_dev *dev,
> - unsigned int type, unsigned int code, int value)
> + unsigned int type, unsigned int code, int *pval)
> {
> int disposition = INPUT_IGNORE_EVENT;
> + int value = *pval;
>
> switch (type) {
>
> @@ -357,6 +358,7 @@ static int input_get_disposition(struct input_dev *dev,
> break;
> }
>
> + *pval = value;
> return disposition;
> }
>
> @@ -365,7 +367,7 @@ static void input_handle_event(struct input_dev *dev,
> {
> int disposition;
>
> - disposition = input_get_disposition(dev, type, code, value);
> + disposition = input_get_disposition(dev, type, code, &value);
>
> if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
> dev->event(dev, type, code, value);
>
> --
> Dmitry

2014-07-20 18:37:50

by Henrik Rydberg

Subject: Re: [PATCH] Input: fix defuzzing logic

Hi Dmitry,

> We attempt to remove noise from coordinates reported by devices in
> input_handle_abs_event(), unfortunately, unless we were dropping the
> event altogether, we were ignoring the adjusted value and were passing
> on the original value instead.
>
> Reviewed-by: Andrew de los Reyes <[email protected]>
> Reviewed-by: Benson Leung <[email protected]>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
> drivers/input/input.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)

Oh my, that was a bad one.

Reviewed-by: Henrik Rydberg <[email protected]>

Thanks,
Henrik