]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Input: elantench - fix misreporting trackpoint coordinates
authorPhoenix Huang <phoenix@emc.com.tw>
Mon, 8 Nov 2021 06:00:03 +0000 (22:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:35:56 +0000 (11:35 +0100)
commit be896bd3b72b44126c55768f14c22a8729b0992e upstream.

Some firmwares occasionally report bogus data from trackpoint, with X or Y
displacement being too large (outside of [-127, 127] range). Let's drop such
packets so that we do not generate jumps.

Signed-off-by: Phoenix Huang <phoenix@emc.com.tw>
Tested-by: Yufei Du <yufeidu@cs.unc.edu>
Link: https://lore.kernel.org/r/20210729010940.5752-1-phoenix@emc.com.tw
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/input/mouse/elantech.c

index 530142b5a115457588a7330131f462ca4b7830c6..a18d17f7ef386268207f615fc9b50d7e452c52d2 100644 (file)
@@ -433,6 +433,19 @@ static void elantech_report_trackpoint(struct psmouse *psmouse,
        case 0x16008020U:
        case 0x26800010U:
        case 0x36808000U:
+
+               /*
+                * This firmware misreport coordinates for trackpoint
+                * occasionally. Discard packets outside of [-127, 127] range
+                * to prevent cursor jumps.
+                */
+               if (packet[4] == 0x80 || packet[5] == 0x80 ||
+                   packet[1] >> 7 == packet[4] >> 7 ||
+                   packet[2] >> 7 == packet[5] >> 7) {
+                       elantech_debug("discarding packet [%6ph]\n", packet);
+                       break;
+
+               }
                x = packet[4] - (int)((packet[1]^0x80) << 1);
                y = (int)((packet[2]^0x80) << 1) - packet[5];