From be55b1aceaef9aa4abda76c0b6b13d389748962b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Dec 2021 13:51:01 +0100 Subject: [PATCH] 5.10-stable patches added patches: hid-holtek-fix-mouse-probing.patch hid-potential-dereference-of-null-pointer.patch --- queue-5.10/hid-holtek-fix-mouse-probing.patch | 49 +++++++++++++++++++ ...otential-dereference-of-null-pointer.patch | 35 +++++++++++++ queue-5.10/series | 2 + 3 files changed, 86 insertions(+) create mode 100644 queue-5.10/hid-holtek-fix-mouse-probing.patch create mode 100644 queue-5.10/hid-potential-dereference-of-null-pointer.patch diff --git a/queue-5.10/hid-holtek-fix-mouse-probing.patch b/queue-5.10/hid-holtek-fix-mouse-probing.patch new file mode 100644 index 00000000000..7b62087018c --- /dev/null +++ b/queue-5.10/hid-holtek-fix-mouse-probing.patch @@ -0,0 +1,49 @@ +From 93a2207c254ca102ebbdae47b00f19bbfbfa7ecd Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires +Date: Mon, 20 Dec 2021 10:51:20 +0100 +Subject: HID: holtek: fix mouse probing + +From: Benjamin Tissoires + +commit 93a2207c254ca102ebbdae47b00f19bbfbfa7ecd upstream. + +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@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 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-holtek-mouse.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +--- a/drivers/hid/hid-holtek-mouse.c ++++ b/drivers/hid/hid-holtek-mouse.c +@@ -65,8 +65,23 @@ static __u8 *holtek_mouse_report_fixup(s + 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; + } + diff --git a/queue-5.10/hid-potential-dereference-of-null-pointer.patch b/queue-5.10/hid-potential-dereference-of-null-pointer.patch new file mode 100644 index 00000000000..19c3c165c4b --- /dev/null +++ b/queue-5.10/hid-potential-dereference-of-null-pointer.patch @@ -0,0 +1,35 @@ +From 13251ce1dd9bb525da2becb9b26fdfb94ca58659 Mon Sep 17 00:00:00 2001 +From: Jiasheng Jiang +Date: Wed, 15 Dec 2021 16:36:05 +0800 +Subject: HID: potential dereference of null pointer + +From: Jiasheng Jiang + +commit 13251ce1dd9bb525da2becb9b26fdfb94ca58659 upstream. + +The return value of devm_kzalloc() needs to be checked. +To avoid hdev->dev->driver_data to be null in case of the failure of +alloc. + +Fixes: 14c9c014babe ("HID: add vivaldi HID driver") +Cc: stable@vger.kernel.org +Signed-off-by: Jiasheng Jiang +Signed-off-by: Benjamin Tissoires +Link: https://lore.kernel.org/r/20211215083605.117638-1-jiasheng@iscas.ac.cn +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-vivaldi.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/hid/hid-vivaldi.c ++++ b/drivers/hid/hid-vivaldi.c +@@ -57,6 +57,9 @@ static int vivaldi_probe(struct hid_devi + int ret; + + drvdata = devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL); ++ if (!drvdata) ++ return -ENOMEM; ++ + hid_set_drvdata(hdev, drvdata); + + ret = hid_parse(hdev); diff --git a/queue-5.10/series b/queue-5.10/series index 3c8639fb41c..4f5f16c23e3 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -4,3 +4,5 @@ net-usb-lan78xx-add-allied-telesis-at29m2-af.patch ext4-prevent-partial-update-of-the-extent-blocks.patch ext4-check-for-out-of-order-index-extents-in-ext4_valid_extent_entries.patch ext4-check-for-inconsistent-extents-between-index-and-leaf-block.patch +hid-holtek-fix-mouse-probing.patch +hid-potential-dereference-of-null-pointer.patch -- 2.47.3