diff options
author | Josh Boyer <jwboyer@redhat.com> | 2013-02-14 09:41:40 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2013-02-14 09:43:56 -0500 |
commit | 04aff465e5f449c09098cc8fb95b778ac8915b61 (patch) | |
tree | 3a21ad604a307f5b28eb737d4165821e7033fbb6 | |
parent | f052f6baaeedbeb79bfe9d1366eb49e8878895d2 (diff) | |
download | kernel-04aff465e5f449c09098cc8fb95b778ac8915b61.tar.gz kernel-04aff465e5f449c09098cc8fb95b778ac8915b61.tar.xz kernel-04aff465e5f449c09098cc8fb95b778ac8915b61.zip |
Add patch to fix corruption on newer M6116 SATA bridges (rhbz 909591)
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | usb-cypress-supertop.patch | 38 |
2 files changed, 45 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index e72bcb2dc..edc0714ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -745,6 +745,9 @@ Patch21247: ath9k_rx_dma_stop_check.patch #rhbz 910126 Patch21249: pstore-Create-a-convenient-mount-point-for-pstore.patch +#rhbz 909591 +Patch21255: usb-cypress-supertop.patch + #rhbz 906309 910848 CVE-2013-0228 Patch21260: xen-dont-assume-ds-is-usable-in-xen_iret-for-32-bit-PVOPS.patch @@ -1461,6 +1464,9 @@ ApplyPatch pstore-Create-a-convenient-mount-point-for-pstore.patch #rhbz 906309 910848 CVE-2013-0228 ApplyPatch xen-dont-assume-ds-is-usable-in-xen_iret-for-32-bit-PVOPS.patch +#rhbz 909591 +ApplyPatch usb-cypress-supertop.patch + # END OF PATCH APPLICATIONS %endif @@ -2317,6 +2323,7 @@ fi # || || %changelog * Thu Feb 14 2013 Josh Boyer <jwboyer@redhat.com> +- Add patch to fix corruption on newer M6116 SATA bridges (rhbz 909591) - CVE-2013-0228 xen: xen_iret() invalid %ds local DoS (rhbz 910848 906309) * Wed Feb 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> diff --git a/usb-cypress-supertop.patch b/usb-cypress-supertop.patch new file mode 100644 index 000000000..3887dc59c --- /dev/null +++ b/usb-cypress-supertop.patch @@ -0,0 +1,38 @@ +From 1cd59b0d0b82c66135bf10ed3a87213a87e318ab Mon Sep 17 00:00:00 2001 +From: Josh Boyer <jwboyer@redhat.com> +Date: Thu, 14 Feb 2013 09:29:55 -0500 +Subject: [PATCH] USB: usb-storage: unusual_devs update for Super TOP SATA + bridge + +The current entry in unusual_cypress.h for the Super TOP SATA bridge devices +seems to be causing corruption on newer revisions of this device. This has +been reported in Arch Linux and Fedora. The original patch was tested on +devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice +as 2.20. Limit the UNUSUAL_DEV entry to devices less than 2.20. + +This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591 + +Reported-by: Carsten S. <carsteniq@yahoo.com> +Tested-by: Carsten S. <carsteniq@yahoo.com> +CC: <stable@vger.kernel.org> +Signed-off-by: Josh Boyer <jwboyer@redhat.com> +--- + drivers/usb/storage/unusual_cypress.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h +index 2c85530..65a6a75 100644 +--- a/drivers/usb/storage/unusual_cypress.h ++++ b/drivers/usb/storage/unusual_cypress.h +@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, + "Cypress ISD-300LP", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), + +-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999, ++UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219, + "Super Top", + "USB 2.0 SATA BRIDGE", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), +-- +1.8.1.2 + |