[arch-commits] Commit in linux-lts/trunk (2 files)

[Andreas Radke]

    Date: Wednesday, December 22, 2021 @ 19:40:29
  Author: andyrtr
Revision: 432923

upgpkg: linux-lts 5.10.88-2: fix mouse probing - FS#73048

Added:
  linux-lts/trunk/0002-HID-holtek-fix-mouse-probing.patch
Modified:
  linux-lts/trunk/PKGBUILD

-----------------------------------------+
 0002-HID-holtek-fix-mouse-probing.patch |   47 ++++++++++++++++++++++++++++++
 PKGBUILD                                |    6 ++-
 2 files changed, 51 insertions(+), 2 deletions(-)

Added: 0002-HID-holtek-fix-mouse-probing.patch
===================================================================
--- 0002-HID-holtek-fix-mouse-probing.patch	                        (rev 0)
+++ 0002-HID-holtek-fix-mouse-probing.patch	2021-12-22 19:40:29 UTC (rev 432923)
@@ -0,0 +1,47 @@
+From b2d8dd6455350d10e35533fe209e7c11170f8deb Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Date: Mon, 20 Dec 2021 10:51:20 +0100
+Subject: [PATCH] HID: holtek: fix mouse probing
+
+An overlook from the previous commit: we don't even parse or start the
+device, meaning that the device is not presented to user space.
+
+Fixes: 93020953d0fa ("HID: check for valid USB device for many HID drivers")
+Cc: stable at vger.kernel.org
+Link: https://bugs.archlinux.org/task/73048
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=215341
+Link: https://lore.kernel.org/r/e4efbf13-bd8d-0370-629b-6c80c0044b15@leemhuis.info/
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+For: https://bugs.archlinux.org/task/73048
+---
+ drivers/hid/hid-holtek-mouse.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c
+index b7172c48ef9f08..7c907939bfae1d 100644
+--- a/drivers/hid/hid-holtek-mouse.c
++++ b/drivers/hid/hid-holtek-mouse.c
+@@ -65,8 +65,23 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ static int holtek_mouse_probe(struct hid_device *hdev,
+ 			      const struct hid_device_id *id)
+ {
++	int ret;
++
+ 	if (!hid_is_usb(hdev))
+ 		return -EINVAL;
++
++	ret = hid_parse(hdev);
++	if (ret) {
++		hid_err(hdev, "hid parse failed: %d\n", ret);
++		return ret;
++	}
++
++	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
++	if (ret) {
++		hid_err(hdev, "hw start failed: %d\n", ret);
++		return ret;
++	}
++
+ 	return 0;
+ }
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-22 18:38:09 UTC (rev 432922)
+++ PKGBUILD	2021-12-22 19:40:29 UTC (rev 432923)
@@ -2,7 +2,7 @@
 
 pkgbase=linux-lts
 pkgver=5.10.88
-pkgrel=1
+pkgrel=2
 pkgdesc='LTS Linux'
 url="https://www.kernel.org/"
 arch=(x86_64)
@@ -17,6 +17,7 @@
   https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+  0002-HID-holtek-fix-mouse-probing.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -26,7 +27,8 @@
 sha256sums=('6f8631b6c382a2b0cfeff1e5f8805c8e1cfbe8d714b6e65f5bb79733c99068eb'
             'SKIP'
             '259196906a6e3c3c4fcbacd083094b3e3d4e2b75cfb7a18382381a88a07399be'
-            '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e')
+            '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e'
+            '4753850a30c6a64e2bb27b1c07ea72f3c40b8c7ee73e890bbc4745860ce1798d')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase