2014-10-24 22:38:52

by Dmitry Torokhov

[permalink] [raw]
Subject: [PATCH] Input: vsxxxaa - fix code dropping bytes from queue

I believe the intent of the code was to drop oldest bytes from the queue,
not the latest if we drop one byte and both latest and some oldest of we
are dropping more than one.

Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/input/mouse/vsxxxaa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 3829823..abd4944 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -128,7 +128,7 @@ static void vsxxxaa_drop_bytes(struct vsxxxaa *mouse, int num)
if (num >= mouse->count) {
mouse->count = 0;
} else {
- memmove(mouse->buf, mouse->buf + num - 1, BUFLEN - num);
+ memmove(mouse->buf, mouse->buf + num, BUFLEN - num);
mouse->count -= num;
}
}
--
2.1.0.rc2.206.gedb03e5


--
Dmitry


2014-10-25 19:47:32

by Jan-Benedict Glaw

[permalink] [raw]
Subject: Re: [PATCH] Input: vsxxxaa - fix code dropping bytes from queue

On Fri, 2014-10-24 15:38:46 -0700, Dmitry Torokhov <[email protected]> wrote:
> I believe the intent of the code was to drop oldest bytes from the queue,
> not the latest if we drop one byte and both latest and some oldest of we
> are dropping more than one.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
> drivers/input/mouse/vsxxxaa.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
> index 3829823..abd4944 100644
> --- a/drivers/input/mouse/vsxxxaa.c
> +++ b/drivers/input/mouse/vsxxxaa.c
> @@ -128,7 +128,7 @@ static void vsxxxaa_drop_bytes(struct vsxxxaa *mouse, int num)
> if (num >= mouse->count) {
> mouse->count = 0;
> } else {
> - memmove(mouse->buf, mouse->buf + num - 1, BUFLEN - num);
> + memmove(mouse->buf, mouse->buf + num, BUFLEN - num);
> mouse->count -= num;
> }
> }

Good catch! I fucked up the error recovery path.

Acked-by: Jan-Benedict Glaw <[email protected]>

MfG, JBG

--
Jan-Benedict Glaw [email protected] +49-172-7608481
Signature of: Eine Freie Meinung in einem Freien Kopf
the second : für einen Freien Staat voll Freier Bürger.

Attachments:
(No filename) (1.24 kB)
 signature.asc (198.00 B)
Digital signature Download all attachments