From a738fe1da7a635cd919b8f16455f62fb5aa696b8 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 25 Jun 2014 08:37:51 -0400 Subject: [PATCH] Revert commit that breaks Wacom Intuos4 from Benjamin Tissoires --- kernel.spec | 5 +++ ...sult-shows-get_report-is-unnecessary.patch | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch diff --git a/kernel.spec b/kernel.spec index 7df6895ec..ad5f1d5f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -745,6 +745,8 @@ Patch25106: x86_32-entry-Do-syscall-exit-work-on-badsys.patch Patch25107: aio-fix-kernel-memory-disclosure-in-io_getevents-int.patch Patch25108: aio-fix-aio-request-leak-when-events-are-reaped-by-u.patch +Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch + # END OF PATCH DEFINITIONS %endif @@ -1458,6 +1460,8 @@ ApplyPatch x86_32-entry-Do-syscall-exit-work-on-badsys.patch ApplyPatch aio-fix-kernel-memory-disclosure-in-io_getevents-int.patch ApplyPatch aio-fix-aio-request-leak-when-events-are-reaped-by-u.patch +ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch + # END OF PATCH APPLICATIONS %endif @@ -2271,6 +2275,7 @@ fi # || || %changelog * Wed Jun 25 2014 Josh Boyer +- Revert commit that breaks Wacom Intuos4 from Benjamin Tissoires - CVE-2014-0206 aio: insufficient head sanitization in aio_read_events_ring (rhbz 1094602 1112975) * Mon Jun 23 2014 Josh Boyer diff --git a/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch b/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch new file mode 100644 index 000000000..f9f4a72a0 --- /dev/null +++ b/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch @@ -0,0 +1,40 @@ +Bugzilla: N/A +Upstream-status: Sent upstream + +This reverts commit 1b2faaf7e219fc2905d75afcd4c815e5d39eda80. + +The Intuos4 series presents a bug in which it hangs if it receives +a set feature command while switching to the enhanced mode. +This bug is triggered when plugging an Intuos 4 while having +a gnome user session up and running. + +Signed-off-by: Benjamin Tissoires +--- + +Hi Aris, + +actually, you bisected the bug, so can I consider that I have your signed-off-by? + +Cheers, +Benjamin + + drivers/input/tablet/wacom_sys.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c +index 7087b33..319a3ff 100644 +--- a/drivers/input/tablet/wacom_sys.c ++++ b/drivers/input/tablet/wacom_sys.c +@@ -536,6 +536,9 @@ static int wacom_set_device_mode(struct usb_interface *intf, int report_id, int + + error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT, + report_id, rep_data, length, 1); ++ if (error >= 0) ++ error = wacom_get_report(intf, WAC_HID_FEATURE_REPORT, ++ report_id, rep_data, length, 1); + } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); + + kfree(rep_data); +-- +1.9.0 +