diff mbox

[2/2] Input: wacom_w8001 - Ignore invalid pen data packets

Message ID 1464059067-6244-1-git-send-email-pingc@wacom.com (mailing list archive)
State Accepted
Headers show

Commit Message

Ping Cheng May 24, 2016, 3:04 a.m. UTC 
ThinkPad X60 Tablet PC (pen only device) sometime posts
packets that are larger than W8001_PKTLEN_TPCPEN.

Reported-by: Chris J Arges <christopherarges@gmail.com>
Tested-by: Chris J Arges <christopherarges@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
---
 drivers/input/touchscreen/wacom_w8001.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Peter Hutterer May 24, 2016, 5:04 a.m. UTC | #1 
On Mon, May 23, 2016 at 08:04:27PM -0700, Ping Cheng wrote:
> ThinkPad X60 Tablet PC (pen only device) sometime posts
> packets that are larger than W8001_PKTLEN_TPCPEN.
> 
> Reported-by: Chris J Arges <christopherarges@gmail.com>
> Tested-by: Chris J Arges <christopherarges@gmail.com>
> Signed-off-by: Ping Cheng <pingc@wacom.com>

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Cheers,
   Peter

> ---
>  drivers/input/touchscreen/wacom_w8001.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
> index b1b4127..d5dcda2 100644
> --- a/drivers/input/touchscreen/wacom_w8001.c
> +++ b/drivers/input/touchscreen/wacom_w8001.c
> @@ -339,6 +339,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
>  		w8001->idx = 0;
>  		parse_multi_touch(w8001);
>  		break;
> +
> +	default:
> +		/*
> +		 * ThinkPad X60 Tablet PC (pen only device) sometime sends
> +		 * invalid data packets that are larger than W8001_PKTLEN_TPCPEN.
> +		 * Let's start over again.
> +		 */
> +		if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1)
> +			w8001->idx = 0;
>  	}
>  
>  	return IRQ_HANDLED;
> -- 
> 1.9.1
 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov June 23, 2016, 6 p.m. UTC | #2 
On Tue, May 24, 2016 at 03:04:35PM +1000, Peter Hutterer wrote:
> On Mon, May 23, 2016 at 08:04:27PM -0700, Ping Cheng wrote:
> > ThinkPad X60 Tablet PC (pen only device) sometime posts
> > packets that are larger than W8001_PKTLEN_TPCPEN.
> > 
> > Reported-by: Chris J Arges <christopherarges@gmail.com>
> > Tested-by: Chris J Arges <christopherarges@gmail.com>
> > Signed-off-by: Ping Cheng <pingc@wacom.com>
> 
> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Applied, thank you.

> 
> Cheers,
>    Peter
> 
> > ---
> >  drivers/input/touchscreen/wacom_w8001.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> > 
> > diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
> > index b1b4127..d5dcda2 100644
> > --- a/drivers/input/touchscreen/wacom_w8001.c
> > +++ b/drivers/input/touchscreen/wacom_w8001.c
> > @@ -339,6 +339,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
> >  		w8001->idx = 0;
> >  		parse_multi_touch(w8001);
> >  		break;
> > +
> > +	default:
> > +		/*
> > +		 * ThinkPad X60 Tablet PC (pen only device) sometime sends
> > +		 * invalid data packets that are larger than W8001_PKTLEN_TPCPEN.
> > +		 * Let's start over again.
> > +		 */
> > +		if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1)
> > +			w8001->idx = 0;
> >  	}
> >  
> >  	return IRQ_HANDLED;
> > -- 
> > 1.9.1
>
diff mbox

Patch

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index b1b4127..d5dcda2 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -339,6 +339,15 @@  static irqreturn_t w8001_interrupt(struct serio *serio,
 		w8001->idx = 0;
 		parse_multi_touch(w8001);
 		break;
+
+	default:
+		/*
+		 * ThinkPad X60 Tablet PC (pen only device) sometime sends
+		 * invalid data packets that are larger than W8001_PKTLEN_TPCPEN.
+		 * Let's start over again.
+		 */
+		if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1)
+			w8001->idx = 0;
 	}
 
 	return IRQ_HANDLED;