From 3161f5713d44a0eb9d231f0d13199b0ed5aac1ec Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 2 Mar 2013 04:21:44 +0000 Subject: [PATCH] Update to 3.8.1 svn path=/dists/trunk/linux/; revision=19884 --- debian/changelog | 5 ++- ...unusual_devs-update-for-Super-TOP-SA.patch | 38 ------------------- ...t-of-bounds-access-to-sock_diag_hand.patch | 33 ---------------- ...-invert-brightness-on-emachines-g725.patch | 7 ++-- debian/patches/series | 2 - 5 files changed, 7 insertions(+), 78 deletions(-) delete mode 100644 debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch delete mode 100644 debian/patches/bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch diff --git a/debian/changelog b/debian/changelog index 485940b19..2c18b44eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -linux (3.8-1~experimental.2) UNRELEASED; urgency=low +linux (3.8.1-1~experimental.1) UNRELEASED; urgency=low + + * New upstream stable update: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.8.1 [ Ben Hutchings ] * linux-image: Increase minimum version of initramfs-tools to 0.110~ diff --git a/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch b/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch deleted file mode 100644 index 8acbfc7be..000000000 --- a/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Josh Boyer -Date: Thu, 14 Feb 2013 09:39:09 -0500 -Subject: USB: usb-storage: unusual_devs update for Super TOP SATA bridge - -commit 18e03310b5caa6d11c1a8c61b982c37047693fba upstream. - -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 - -The Arch Forum post on this is here: - https://bbs.archlinux.org/viewtopic.php?id=152011 - -Reported-by: Carsten S. -Tested-by: Carsten S. -Signed-off-by: Josh Boyer -Signed-off-by: Greg Kroah-Hartman ---- - 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), diff --git a/debian/patches/bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch b/debian/patches/bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch deleted file mode 100644 index ec63421ca..000000000 --- a/debian/patches/bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Mathias Krause -Date: Sat, 23 Feb 2013 01:13:47 +0000 -Subject: sock_diag: Fix out-of-bounds access to sock_diag_handlers[] - -commit 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 upstream. - -Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY -with a family greater or equal then AF_MAX -- the array size of -sock_diag_handlers[]. The current code does not test for this -condition therefore is vulnerable to an out-of-bound access opening -doors for a privilege escalation. - -Signed-off-by: Mathias Krause -Acked-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/core/sock_diag.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c -index 602cd63..750f44f 100644 ---- a/net/core/sock_diag.c -+++ b/net/core/sock_diag.c -@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - if (nlmsg_len(nlh) < sizeof(*req)) - return -EINVAL; - -+ if (req->sdiag_family >= AF_MAX) -+ return -EINVAL; -+ - hndl = sock_diag_lock_handler(req->sdiag_family); - if (hndl == NULL) - err = -ENOENT; diff --git a/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch b/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch index 179a12cc3..e02188c2a 100644 --- a/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch +++ b/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch @@ -8,15 +8,14 @@ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59628 Reported-by: Roland Gruber Signed-off-by: Jani Nikula Signed-off-by: Daniel Vetter +[bwh: Adjust context to apply after 3.8.1] --- -diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 7725446..44f9d8f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8599,6 +8599,9 @@ static struct intel_quirk intel_quirks[] = { - /* Acer Aspire 5734Z must invert backlight brightness */ - { 0x2a42, 0x1025, 0x0459, quirk_invert_brightness }, + /* Acer Aspire 4736Z */ + { 0x2a42, 0x1025, 0x0260, quirk_invert_brightness }, + + /* Acer/eMachines G725 */ + { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness }, diff --git a/debian/patches/series b/debian/patches/series index ed041152f..4883c495f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -62,7 +62,6 @@ debian/mgag200-disable-autoload.patch bugfix/all/ath6kl-do-not-use-virt_addr_valid.patch features/all/xen/microcode-api-update.patch -bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch @@ -79,5 +78,4 @@ bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch -bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch features/all/alx/alx-update-for-3.8.patch