From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbbALAbJ (ORCPT ); Sun, 11 Jan 2015 19:31:09 -0500 Received: from mail-ie0-f182.google.com ([209.85.223.182]:59858 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbbALAbG (ORCPT ); Sun, 11 Jan 2015 19:31:06 -0500 Date: Sun, 11 Jan 2015 16:31:00 -0800 From: Dmitry Torokhov To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: Hans de Goede , Yunkang Tang , Vadim Klishko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 6/7] input: alps: Add sanity checks for non DualPoint devices Message-ID: <20150112003100.GC31862@dtor-ws> References: <1415993906-13307-1-git-send-email-pali.rohar@gmail.com> <1415993906-13307-7-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1415993906-13307-7-git-send-email-pali.rohar@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 14, 2014 at 08:38:25PM +0100, Pali Rohár wrote: > This patch adds sanity checks and reject trackstick packets from ALPS devices > which do not have trackstick present (those without ALPS_DUALPOINT flag). > > Make sure that driver does not process some bogus packets as trackstick data > when there is no trackstick packet. Patch also write warning do dmesg so > possible problems with driver (e.g received invalid data) will be visible > for debugging. > > Signed-off-by: Pali Rohár Applied, thank you. > --- > drivers/input/mouse/alps.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > index 2b7b74d..770bec5 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -475,6 +475,13 @@ static void alps_process_trackstick_packet_v3(struct psmouse *psmouse) > struct input_dev *dev = priv->dev2; > int x, y, z, left, right, middle; > > + /* It should be a DualPoint when received trackstick packet */ > + if (!(priv->flags & ALPS_DUALPOINT)) { > + psmouse_warn(psmouse, > + "Rejected trackstick packet from non DualPoint device"); > + return; > + } > + > /* Sanity check packet */ > if (!(packet[0] & 0x40)) { > psmouse_dbg(psmouse, "Bad trackstick packet, discarding\n"); > @@ -699,7 +706,8 @@ static void alps_process_touchpad_packet_v3_v5(struct psmouse *psmouse) > > alps_report_semi_mt_data(psmouse, fingers); > > - if (!(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS)) { > + if ((priv->flags & ALPS_DUALPOINT) && > + !(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS)) { > input_report_key(dev2, BTN_LEFT, f->ts_left); > input_report_key(dev2, BTN_RIGHT, f->ts_right); > input_report_key(dev2, BTN_MIDDLE, f->ts_middle); > @@ -743,8 +751,11 @@ static void alps_process_packet_v6(struct psmouse *psmouse) > */ > if (packet[5] == 0x7F) { > /* It should be a DualPoint when received Trackpoint packet */ > - if (!(priv->flags & ALPS_DUALPOINT)) > + if (!(priv->flags & ALPS_DUALPOINT)) { > + psmouse_warn(psmouse, > + "Rejected trackstick packet from non DualPoint device"); > return; > + } > > /* Trackpoint packet */ > x = packet[1] | ((packet[3] & 0x20) << 2); > @@ -962,6 +973,13 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse) > struct input_dev *dev2 = priv->dev2; > int x, y, z, left, right, middle; > > + /* It should be a DualPoint when received trackstick packet */ > + if (!(priv->flags & ALPS_DUALPOINT)) { > + psmouse_warn(psmouse, > + "Rejected trackstick packet from non DualPoint device"); > + return; > + } > + > /* > * b7 b6 b5 b4 b3 b2 b1 b0 > * Byte0 0 1 0 0 1 0 0 0 > -- > 1.7.9.5 > -- Dmitry