rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert broken usb patch

This commit is contained in:
Josh Boyer 2016-02-22 08:13:42 -05:00
parent 4988639cd8
commit 1c2eca9c65
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Revert-usb-hub-do-not-clear-BOS-field-during-reset-d.patch Normal file
View File

@ -0,0 +1,46 @@
From 2ea58e6dba5a959e5a7928b866b8ab035c9191a6 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mon, 22 Feb 2016 08:09:46 -0500
Subject: [PATCH] Revert "usb: hub: do not clear BOS field during reset device"
This reverts commit 9932571e08f36fdb83d8a29de5a6b6aeae6dbfb8.
This causes memory corruption or oopses if a USB3 device is unplugged
during operation.
http://thread.gmane.org/gmane.linux.kernel.stable/165813
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
---
drivers/usb/core/hub.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a2fef797d553..62084335a608 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5377,6 +5377,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
}
bos = udev->bos;
+ udev->bos = NULL;
for (i = 0; i < SET_CONFIG_TRIES; ++i) {
@@ -5469,11 +5470,8 @@ done:
usb_set_usb2_hardware_lpm(udev, 1);
usb_unlocked_enable_lpm(udev);
usb_enable_ltm(udev);
- /* release the new BOS descriptor allocated by hub_port_init() */
- if (udev->bos != bos) {
- usb_release_bos_descriptor(udev);
- udev->bos = bos;
- }
+ usb_release_bos_descriptor(udev);
+ udev->bos = bos;
return 0;
re_enumerate:
--
2.5.0

9
kernel.spec
View File

@ -40,7 +40,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 200
%global baserelease 201
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -695,6 +695,8 @@ Patch652: drm-mgag200-fix-kernel-hang-in-cursor-code.patch
#CVE-2015-8812 rhbz 1303532 1309548
Patch653: iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
Patch654: Revert-usb-hub-do-not-clear-BOS-field-during-reset-d.patch
# END OF PATCH DEFINITIONS
%endif
@ -1454,6 +1456,8 @@ ApplyPatch drm-mgag200-fix-kernel-hang-in-cursor-code.patch
#CVE-2015-8812 rhbz 1303532 1309548
ApplyPatch iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
ApplyPatch Revert-usb-hub-do-not-clear-BOS-field-during-reset-d.patch
# END OF PATCH APPLICATIONS
%endif
@ -2303,6 +2307,9 @@ fi
#
#
%changelog
* Mon Feb 22 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.6-201
- Revert broken usb patch
* Sat Feb 20 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.6-200
- Linux v4.3.6