[kernel] r15762 - in dists/sid/linux-2.6/debian/patches/bugfix: all mips powerpc sparc x86
Ben Hutchings
benh at alioth.debian.org
Mon May 24 03:34:33 UTC 2010
Author: benh
Date: Mon May 24 03:34:28 2010
New Revision: 15762
Log:
Update bugfix patch format
Use git mailbox format with the added line 'commit <id> upstream', as
in the stable series.
Where a patch has been committed upstream unchanged except for the
commit message, use the committed version.
This covers almost all bugfixes that are still applied.
Modified:
dists/sid/linux-2.6/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-create-links-for-included-sources.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/Documentation-3c509-document-ethtool-support.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/KEYS-find_keyring_by_name-can-gain-access-to-a-freed.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/KVM-x86-Extend-KVM_SET_VCPU_EVENTS-with-selective-up.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ath5k-Fix-eeprom-checksum-check-for-custom-sized-eeproms.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/cifs-allow-null-nd-on-create.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/clockevents-Dont-remove-broadcast-device.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter-2.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libata-unlock-HPA-if-device-shrunk.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/mac80211-explicitly-disable-enable-QoS.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-fix-reference-counting.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-rework-object-lifetime-rules.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/megaraid_sas-fix-compat_ioctl-sense_ptr.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Fix-NEWCTX_DONE-flag-number.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Make-ctxprog-wait-for-interrupt-handler.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54-disable-channels-with-incomplete-calibration-dat.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-bugs-in-p54p_check_tx_ring.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-serious-sparse-warning.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-prevent-stuck-rx-ring.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-revise-tx-locking.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-rx-frame-length-check.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Add-workspace-for-GMAC-bug-workaround.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Disable-TX-descriptor-prefetch-watchdog.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-DMA-mapping-cleanup-on-error-in-TSO.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-SFE4002-initialisation.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-conditions-for-MDIO-self-test.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-polling-for-slow-MCDI-operations.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-sign-of-efx_mcdi_poll_reboot-error-in-efx_mcdi_poll.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Include-XGXS-in-XMAC-link-status-check.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Move-PHY-software-state-initialisation.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Add-error-message-for-suspected-bad-SFP-cable.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Switch-into-self-configure-mode.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-bug.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-firmware-initialisation.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT202x-Remove-unreliable-MMD-check.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-SFE4002-SFN4112F-Widen-temperature-voltage-tolerances.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Use-fixed-size-buffers-for-MCDI-NVRAM-requests.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-incorrect-dereference-of-userspace-pointe.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/virtio_net-Make-delayed-refill-more-reliable.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/vlan-macvlan-propagate-transmission-state-to-upper-layer.patch
dists/sid/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch
dists/sid/linux-2.6/debian/patches/bugfix/mips/fpu-emulator.patch
dists/sid/linux-2.6/debian/patches/bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch
dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-use-of-uid16_t-and-gid16_t.patch
dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Provide-io-read-write-16-32-be.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch Mon May 24 03:34:28 2010 (r15762)
@@ -2,6 +2,8 @@
Date: Wed, 7 Apr 2010 20:55:47 -0700
Subject: [PATCH] 3c503: Fix IRQ probing
+commit b0cf4dfb7cd21556efd9a6a67edcba0840b4d98d upstream.
+
The driver attempts to select an IRQ for the NIC automatically by
testing which of the supported IRQs are available and then probing
each available IRQ with probe_irq_{on,off}(). There are obvious race
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-copy-images-after-building-HTML.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-copy-images-after-building-HTML.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,10 +1,16 @@
-From 8116c08e4d24087d35f7ad949f754a5207e2eef8 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sat, 21 Nov 2009 04:01:56 +0000
-Subject: [PATCH 1/2] DocBook/media: copy images after building HTML
+Date: Thu, 3 Dec 2009 19:50:35 -0300
+Subject: [PATCH] V4L/DVB (13680a): DocBook/media: copy images after building HTML
+
+commit 49b14650ba5bf80234cb1984fd8396aff03430ce upstream.
The rule for %.html removes the output directory, so there is no point
in copying images before building HTML.
+
+Documentation/DocBook/Makefile | 10 +++++-----
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
Documentation/DocBook/Makefile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
@@ -43,5 +49,5 @@
installmandocs: mandocs
mkdir -p /usr/local/man/man9/
--
-1.6.5.2
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-create-links-for-included-sources.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-create-links-for-included-sources.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/DocBook-media-create-links-for-included-sources.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,10 +1,19 @@
-From 5c9556f8aedbaa6a419b39e4eac6045c6686e944 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sat, 21 Nov 2009 04:06:35 +0000
-Subject: [PATCH 2/2] DocBook/media: create links for included sources
+Date: Thu, 3 Dec 2009 19:51:09 -0300
+Subject: [PATCH] V4L/DVB (13680b): DocBook/media: create links for included sources
+
+commit 5bf583473813530c1bf82051a35fac8d5045f4f7 upstream.
If docs are being built in a separate directory, xmlto and xsltproc
can't find included sources. Make links back to the source directory.
+
+I would much prefer to have xmlto and xsltproc look in the source
+directory for included entities but couldn't see how to do that. This
+needs to be solved in some way for 2.6.32, even if this patch isn't the
+right way to do it.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
Documentation/DocBook/Makefile | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
@@ -43,5 +52,5 @@
mkdir -p /usr/local/man/man9/
install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
--
-1.6.5.2
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/Documentation-3c509-document-ethtool-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/Documentation-3c509-document-ethtool-support.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/Documentation-3c509-document-ethtool-support.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,14 +1,16 @@
-From 9e251f34b1994d31c9553437c7896777df00a410 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Mon, 11 Jan 2010 23:28:51 +0000
+Date: Mon, 11 Jan 2010 15:53:45 -0800
Subject: [PATCH] Documentation/3c509: document ethtool support
+commit aa4e2e171385bb77b4da8b760d26dea2aa291587 upstream.
+
3c509 was changed to support ethtool in 2002, making the 'xcvr' module
parameter obsolete in most cases. More recently 3c509 was converted
to the modern driver model and this parameter was removed. Fix the
documentation to refer to ethtool rather than the module parameter.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
Documentation/networking/3c509.txt | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
@@ -52,5 +54,5 @@
(4a) Interpretation of error messages and common problems
--
-1.6.5.7
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 3c31f07ad0dab02fe17195d32a965d57fd947707 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 14 Feb 2010 14:18:53 +0000
Subject: [PATCH] Driver core: Fix first line of kernel-doc for a few functions
+commit 3c31f07ad0dab02fe17195d32a965d57fd947707 upstream.
+
The function name must be followed by a space, hypen, space, and a
short description.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/KEYS-find_keyring_by_name-can-gain-access-to-a-freed.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/KEYS-find_keyring_by_name-can-gain-access-to-a-freed.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/KEYS-find_keyring_by_name-can-gain-access-to-a-freed.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From cea7daa3589d6b550546a8c8963599f7c1a3ae5c Mon Sep 17 00:00:00 2001
From: Toshiyuki Okajima <toshi.okajima at jp.fujitsu.com>
Date: Fri, 30 Apr 2010 14:32:13 +0100
Subject: [PATCH] KEYS: find_keyring_by_name() can gain access to a freed keyring
+commit cea7daa3589d6b550546a8c8963599f7c1a3ae5c upstream.
+
find_keyring_by_name() can gain access to a keyring that has had its reference
count reduced to zero, and is thus ready to be freed. This then allows the
dead keyring to be brought back into use whilst it is being destroyed.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/KVM-x86-Extend-KVM_SET_VCPU_EVENTS-with-selective-up.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/KVM-x86-Extend-KVM_SET_VCPU_EVENTS-with-selective-up.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/KVM-x86-Extend-KVM_SET_VCPU_EVENTS-with-selective-up.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From dab4b911a5327859bb8f969249c6978c26cd4853 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka at web.de>
Date: Sun, 6 Dec 2009 18:24:15 +0100
Subject: [PATCH] KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates
+commit dab4b911a5327859bb8f969249c6978c26cd4853 upstream.
+
User space may not want to overwrite asynchronously changing VCPU event
states on write-back. So allow to skip nmi.pending and sipi_vector by
setting corresponding bits in the flags field of kvm_vcpu_events.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ath5k-Fix-eeprom-checksum-check-for-custom-sized-eeproms.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ath5k-Fix-eeprom-checksum-check-for-custom-sized-eeproms.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ath5k-Fix-eeprom-checksum-check-for-custom-sized-eeproms.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 608ad4393323f00eab79828bdfda3ff1d520532e Mon Sep 17 00:00:00 2001
From: Luis R. Rodriguez <lrodriguez at atheros.com>
Date: Mon, 28 Dec 2009 15:40:42 -0800
Subject: [PATCH] ath5k: Fix eeprom checksum check for custom sized eeproms
+commit 608ad4393323f00eab79828bdfda3ff1d520532e upstream.
+
Commit 8bf3d79bc401ca417ccf9fc076d3295d1a71dbf5 enabled EEPROM
checksum checks to avoid bogus bug reports but failed to address
updating the code to consider devices with custom EEPROM sizes.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch Mon May 24 03:34:28 2010 (r15762)
@@ -4,6 +4,8 @@
Date: Sat, 15 May 2010 20:09:28 +0200
Subject: [PATCH 2/8] block: restart partition scan after resizing a device
+commit 56bca01738733709bef076e2e97bbd01e5659f24 upstream.
+
Device resize via ->set_capacity() can reveal new partitions (e.g. in
chained partition table formats such as dos extended parts). Restart
partition scan from the beginning after resizing a device. This
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch Mon May 24 03:34:28 2010 (r15762)
@@ -5,6 +5,8 @@
Subject: [PATCH 1/8] buffer: make invalidate_bdev() drain all percpu LRU
add caches
+commit fa4b9074cd8428958c2adf9dc0c831f46e27c193 upstream.
+
invalidate_bdev() should release all page cache pages which are clean
and not being used; however, if some pages are still in the percpu LRU
add caches on other cpus, those pages are considered in used and don't
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From ee3585e8db845cba146ecfd829b8c37f1447e1a7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Thu, 28 Jan 2010 23:11:20 +0000
Subject: [PATCH] cdc_ether: Partially revert "usbnet: Set link down initially ..."
+commit 71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3 upstream.
+
Commit 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ("usbnet: Set link down
initially for drivers that update link state") changed the initial link
state in cdc_ether and other drivers based on the understanding that the
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/cifs-allow-null-nd-on-create.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/cifs-allow-null-nd-on-create.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/cifs-allow-null-nd-on-create.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,4 +1,8 @@
-[CIFS] Allow null nd (as nfs server uses) on create
+From: Steve French <sfrench at us.ibm.com>
+Date: Thu, 22 Apr 2010 19:21:55 +0000
+Subject: [PATCH] [CIFS] Allow null nd (as nfs server uses) on create
+
+commit fa588e0c57048b3d4bfcd772d80dc0615f83fd35 upstream.
While creating a file on a server which supports unix extensions
such as Samba, if a file is being created which does not supply
@@ -7,12 +11,8 @@
Signed-off-by: Shirish Pargaonkar <shirishp at us.ibm.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
----
-
-
Adjusted to apply to Debian's 2.6.32 by dann frazier <dannf at debian.org>
-
-
+---
diff -urpN a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
--- a/fs/cifs/cifsproto.h 2009-12-02 20:51:21.000000000 -0700
+++ b/fs/cifs/cifsproto.h 2010-04-30 00:24:18.000000000 -0600
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/clockevents-Dont-remove-broadcast-device.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/clockevents-Dont-remove-broadcast-device.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/clockevents-Dont-remove-broadcast-device.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From ea9d8e3f45404d411c00ae67b45cc35c58265bb7 Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng at redhat.com>
Date: Thu, 7 Jan 2010 11:22:44 +0800
Subject: [PATCH] clockevent: Don't remove broadcast device when cpu is dead
+commit ea9d8e3f45404d411c00ae67b45cc35c58265bb7 upstream.
+
Marc reported that the BUG_ON in clockevents_notify() triggers on his
system. This happens because the kernel tries to remove an active
clock event device (used for broadcasting) from the device list.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From a362c638bdf052bf424bce7645d39b101090f6ba Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx at linutronix.de>
Date: Sat, 14 Nov 2009 00:26:34 +0100
Subject: [PATCH] clocksource/events: Fix fallout of generic code changes
+commit a362c638bdf052bf424bce7645d39b101090f6ba upstream.
+
powerpc grew a new warning due to the type change of clockevent->mult.
The architectures which use parts of the generic time keeping
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 46d885d4ee0ee63806d8a0b43368b99c451dcbe9 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Tue, 29 Dec 2009 17:21:05 +0100
+Date: Thu, 7 Jan 2010 02:41:51 +0000
Subject: [PATCH] dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
+commit 4d907069bc1b745f4abd4745c332d33098e733b8 upstream.
+
The Davicom DM9100 and DM9102 chips are used on the motherboards of
some SPARC systems (supported by the tulip driver) and also in PCI
expansion cards (supported by the dmfe driver). There is no
@@ -12,6 +13,8 @@
properties for them, so we do that.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Grant Grundler <grundler at parisc-linux.org>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
drivers/net/tulip/Kconfig | 4 ++++
drivers/net/tulip/dmfe.c | 21 +++++++++++++++++++++
@@ -140,5 +143,5 @@
/*
* Looks for early PCI chipsets where people report hangs
--
-1.6.5.7
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 088ea189c4c75cdf211146faa4b341a0f7476be6 Mon Sep 17 00:00:00 2001
From: Darren Jenkins <darrenrjenkins at gmail.com>
Date: Wed, 17 Feb 2010 23:40:15 +1100
Subject: [PATCH] drivers/net/wireless/p54/txrx.c Fix off by one error
+commit 088ea189c4c75cdf211146faa4b341a0f7476be6 upstream.
+
fix off by one error in the queue size check of p54_tx_qos_accounting_alloc()
Coverity CID: 13314
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,17 +1,24 @@
-commit 480c1e36532fc2783834d9582a11fbf1d493af42
-Author: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun Aug 16 03:42:24 2009 +0100
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 23 Jan 2010 18:40:29 +0000
+Subject: [PATCH] [SCSI] qla1280: Drop host_lock while requesting firmware
- qla1280: Drop host_lock while requesting firmware
-
- request_firmware() may sleep and it appears to be safe to release the
- spinlock here.
+commit 2cec802980727f1daa46d8c31b411e083d49d7a2 upstream.
+
+request_firmware() may sleep and it appears to be safe to release the
+spinlock here.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: stable at kernel.org
+Signed-off-by: James Bottomley <James.Bottomley at suse.de>
+---
+ drivers/scsi/qla1280.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
-index 5defe5e..97cbf12 100644
+index 8371d91..49ac414 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
-@@ -1642,8 +1642,10 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha)
+@@ -1640,8 +1640,10 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha)
uint16_t mb[MAILBOX_REGISTER_COUNT], i;
int err;
@@ -22,7 +29,7 @@
if (err) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n",
ql1280_board_tbl[ha->devnum].fwname, err);
-@@ -1701,8 +1703,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
+@@ -1699,8 +1701,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
return -ENOMEM;
#endif
@@ -33,3 +40,6 @@
if (err) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n",
ql1280_board_tbl[ha->devnum].fwname, err);
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,22 +1,25 @@
From: Adam Jackson <ajax at redhat.com>
-To: dri-devel at lists.freedesktop.org
-Subject: [PATCH] drm/edid: Fix 1024x768 at 85Hz
Date: Thu, 13 May 2010 14:55:28 -0400
-Message-Id: <1273776928-16924-1-git-send-email-ajax at redhat.com>
+Subject: [PATCH] drm/edid: Fix 1024x768 at 85Hz
+
+commit 61dd98fad58f945ed720ba132681acb58fcee015 upstream.
Having hsync both start and end on pixel 1072 ain't gonna work very
well. Matches the X server's list.
Signed-off-by: Adam Jackson <ajax at redhat.com>
+Tested-By: Michael Tokarev <mjt at tls.msk.ru>
+Cc: stable at kernel.org
+Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/gpu/drm/drm_edid.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 18f41d7..10348d3 100644
+index 3556308..326f28e 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
-@@ -335,7 +335,7 @@ static struct drm_display_mode drm_dmt_modes[] = {
+@@ -496,7 +496,7 @@ static struct drm_display_mode drm_dmt_modes[] = {
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
/* 1024x768 at 85Hz */
{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072,
@@ -26,9 +29,5 @@
/* 1152x864 at 75Hz */
{ DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216,
--
-1.7.0.1
+1.7.1
-_______________________________________________
-dri-devel mailing list
-dri-devel at lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/dri-devel
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter-2.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter-2.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter-2.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 6e6c822868f113dabe3c33bdd91e883cc28fa11b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric at anholt.net>
Date: Wed, 17 Mar 2010 13:48:06 -0700
Subject: [PATCH] drm/i915: Stop trying to use ACPI lid status to determine LVDS connection.
+commit 6e6c822868f113dabe3c33bdd91e883cc28fa11b upstream.
+
I've been getting more and more quirk reports about this. It seems
clear at this point that other OSes are not using this for determining
whether the integrated panel should be turned on, and it is not
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,11 +1,8 @@
From: Theodore Ts'o <tytso at mit.edu>
-Date: Tue, 20 Apr 2010 20:51:59 +0000 (-0400)
-Subject: ext4: Issue the discard operation *before* releasing the blocks to be reused
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b90f687018e6d6c77d981b09203780f7001407e5
+Date: Tue, 20 Apr 2010 16:51:59 -0400
+Subject: [PATCH] ext4: Issue the discard operation *before* releasing the blocks to be reused
-ext4: Issue the discard operation *before* releasing the blocks to be reused
-
-[ backported to 2.6.3[23] ]
+commit b90f687018e6d6c77d981b09203780f7001407e5 upstream.
Otherwise, we can end up having data corruption because the blocks
could get reused and then discarded!
@@ -13,6 +10,7 @@
https://bugzilla.kernel.org/show_bug.cgi?id=15579
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
+[ backported to 2.6.3[23] ]
---
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 5c659322a904a7cc0265e7b183372b9bdebec6db Mon Sep 17 00:00:00 2001
From: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Tue, 13 Apr 2010 18:49:51 -0700
Subject: [PATCH] forcedeth: fix tx limit2 flag check
+commit 5c659322a904a7cc0265e7b183372b9bdebec6db upstream.
+
This is a fix for bug 572201 @ bugs.debian.org
This patch fixes the TX_LIMIT feature flag. The previous logic check
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch Mon May 24 03:34:28 2010 (r15762)
@@ -2,9 +2,8 @@
From: Dan Carpenter <error27 at gmail.com>
Date: Mon, 26 Apr 2010 23:20:12 +0000
Subject: [PATCH] ipheth: potential null dereferences on error path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+
+commit d87ff58fda926fe5cb01214cccf1c72422ac776d upstream.
The calls to usb_free_buffer() dereference rx_urb and tx_urb in the
parameter list but those could be NULL.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 07a6e68c8be45f9b5ea6689c8b247fa15a4fc0d4 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka at redhat.com>
Date: Mon, 29 Mar 2010 12:18:35 +0200
Subject: [PATCH 2/2] iwlwifi: manage QoS by mac stack
+commit e61146e36b40fd9d346118c40285913236c329f3 upstream.
+
We activate/deactivate QoS and setup default queue parameters in iwlwifi
driver. Mac stack do the same, so we do not need repeat that work here.
Stack also will tell when disable QoS, this will fix driver when working
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 9a86e2bad0b9fbf3290ae496da6dab9536dd6bf7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Fri, 5 Mar 2010 13:43:17 -0800
Subject: [PATCH] lib: fix first line of kernel-doc for a few functions
+commit 9a86e2bad0b9fbf3290ae496da6dab9536dd6bf7 upstream.
+
The function name must be followed by a space, hypen, space, and a short
description.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,7 +1,8 @@
From: Mark Lord <kernel at teksavvy.com>
Date: Wed, 7 Apr 2010 17:52:08 +0000 (-0400)
Subject: libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=45c4d015a92f72ec47acd0c7557abdc0c8a6499d
+
+commit 45c4d015a92f72ec47acd0c7557abdc0c8a6499d upstream.
libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libata-unlock-HPA-if-device-shrunk.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libata-unlock-HPA-if-device-shrunk.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libata-unlock-HPA-if-device-shrunk.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 445d211b0da4e9a6e6d576edff85085c2aaf53df Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj at kernel.org>
Date: Mon, 5 Apr 2010 10:33:13 +0900
Subject: [PATCH] libata: unlock HPA if device shrunk
+commit 445d211b0da4e9a6e6d576edff85085c2aaf53df upstream.
+
Some BIOSes don't configure HPA during boot but do so while resuming.
This causes harddrives to shrink during resume making libata detach
and reattach them. This can be worked around by unlocking HPA if old
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/mac80211-explicitly-disable-enable-QoS.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/mac80211-explicitly-disable-enable-QoS.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/mac80211-explicitly-disable-enable-QoS.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 38c1a8432ffd1796a5fff4070d5c83c3d0ce7c57 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka at redhat.com>
Date: Mon, 29 Mar 2010 12:18:34 +0200
Subject: [PATCH 1/2] mac80211: explicitly disable/enable QoS
+commit e1b3ec1a2a336c328c336cfa5485a5f0484cc90d upstream.
+
Add interface to disable/enable QoS (aka WMM or WME). Currently drivers
enable it explicitly when ->conf_tx method is called, and newer disable.
Disabling is needed for some APs, which do not support QoS, such
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-fix-reference-counting.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-fix-reference-counting.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-fix-reference-counting.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 564517e804c9c6d4e29c270bfc1517404d27107b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd at arndb.de>
Date: Thu, 11 Feb 2010 05:55:39 +0000
Subject: [PATCH 2/5] net/macvtap: fix reference counting
+commit 564517e804c9c6d4e29c270bfc1517404d27107b upstream.
+
The RCU usage in the original code was broken because
there are cases where we possibly sleep with rcu_read_lock
held. As a fix, change the macvtap_file_get_queue to
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-rework-object-lifetime-rules.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-rework-object-lifetime-rules.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/macvtap-rework-object-lifetime-rules.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 02df55d28c6001a3cdb7a997a34a0b01f01d015e Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd at arndb.de>
Date: Thu, 18 Feb 2010 05:45:36 +0000
Subject: [PATCH 3/5] macvtap: rework object lifetime rules
+commit 02df55d28c6001a3cdb7a997a34a0b01f01d015e upstream.
+
This reworks the change done by the previous patch
in a more complete way.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/megaraid_sas-fix-compat_ioctl-sense_ptr.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/megaraid_sas-fix-compat_ioctl-sense_ptr.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/megaraid_sas-fix-compat_ioctl-sense_ptr.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From b3dc1a212e5167984616445990c76056034f8eeb Mon Sep 17 00:00:00 2001
From: Tomas Henzl <thenzl at redhat.com>
Date: Thu, 11 Feb 2010 18:01:50 +0100
Subject: [PATCH] [SCSI] megaraid_sas: fix for 32bit apps
+commit b3dc1a212e5167984616445990c76056034f8eeb upstream.
+
It looks like this patch -
commit 7b2519afa1abd1b9f63aa1e90879307842422dae
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,10 +1,14 @@
-From a66096c37e202b623264b1a784562322a76dea03 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 14 Feb 2010 05:04:36 +0000
-Subject: [PATCH 3/5] net: Fix first line of kernel-doc for a few functions
+Date: Sun, 14 Feb 2010 22:35:47 -0800
+Subject: [PATCH] net: Fix first line of kernel-doc for a few functions
+
+commit 1a5778aa000ebfec7f07eed0ffa2852ffb5d16bb upstream.
The function name must be followed by a space, hypen, space, and a
short description.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
include/linux/skbuff.h | 4 ++--
include/net/sock.h | 2 +-
@@ -47,7 +51,7 @@
*
* Remove a filter from a socket and release its resources.
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
-index 9ac493f..8d63f8f 100644
+index 49278f8..9ea4538 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -78,7 +78,7 @@ rpc_timeout_upcall_queue(struct work_struct *work)
@@ -60,5 +64,5 @@
* @msg: message to queue
*
--
-1.7.0
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Fix-NEWCTX_DONE-flag-number.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Fix-NEWCTX_DONE-flag-number.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Fix-NEWCTX_DONE-flag-number.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,10 +1,8 @@
-From 81cad7895061ee10c9ee4d3f1471ab70da1c6fc4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin at 0x04.net>
+From: Marcin Kościelnicki <koriakin at 0x04.net>
Date: Wed, 17 Mar 2010 00:58:47 +0000
Subject: [PATCH] drm/nv50: Fix NEWCTX_DONE flag number
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+
+commit 0dd8c3f093e3d0cab2cc967f9620b41a125f1f56 upstream.
Signed-off-by: Marcin Kościelnicki <koriakin at 0x04.net>
Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Make-ctxprog-wait-for-interrupt-handler.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Make-ctxprog-wait-for-interrupt-handler.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/nouveau-nv50-Make-ctxprog-wait-for-interrupt-handler.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,10 +1,8 @@
-From 3bf777bf0ab112527cea103c3681934a9f41c03d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin at 0x04.net>
+From: Marcin Kościelnicki <koriakin at 0x04.net>
Date: Sun, 28 Feb 2010 23:45:38 +0000
Subject: [PATCH] drm/nv50: Make ctxprog wait until interrupt handler is done.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+
+commit 3bf777bf0ab112527cea103c3681934a9f41c03d upstream.
This will fix races between generated ctxprogs and interrupt handler.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54-disable-channels-with-incomplete-calibration-dat.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54-disable-channels-with-incomplete-calibration-dat.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54-disable-channels-with-incomplete-calibration-dat.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 93a59d7527147e3656664aa3179f8d19de256081 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey at googlemail.com>
Date: Sat, 31 Oct 2009 22:59:27 +0100
Subject: [PATCH] p54: disable channels with incomplete calibration data sets
+commit 93a59d7527147e3656664aa3179f8d19de256081 upstream.
+
James Grossmann [1] reported that p54 spews out confusing
messages instead of preventing the mayhem from happening.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-bugs-in-p54p_check_tx_ring.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-bugs-in-p54p_check_tx_ring.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-bugs-in-p54p_check_tx_ring.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,96 +1,29 @@
-Return-Path: <linux-wireless-owner at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on dual
-X-Spam-Level:
-X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
- KB_DATE_CONTAINS_TAB autolearn=no version=3.3.1
-X-Original-To: maks at dual
-Delivered-To: maks at dual
-Received: from dual (localhost.localdomain [127.0.0.1])
- by dual (Postfix) with ESMTP id ED48524045
- for <maks at dual>; Fri, 23 Apr 2010 04:14:59 +0200 (CEST)
-X-Original-To: max at stro.at
-Delivered-To: max at stro.at
-Received: from baikonur.stro.at [213.239.196.228]
- by dual with POP3 (fetchmail-6.3.16)
- for <maks at dual> (single-drop); Fri, 23 Apr 2010 04:14:59 +0200 (CEST)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by baikonur.stro.at (Postfix) with ESMTP id 407AB5C001
- for <max at stro.at>; Thu, 22 Apr 2010 19:44:39 +0200 (CEST)
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
- id S1755433Ab0DVRwc (ORCPT <rfc822;max at stro.at>);
- Thu, 22 Apr 2010 13:52:32 -0400
-Received: from mail-vw0-f46.google.com ([209.85.212.46]:52767 "EHLO
- mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1755072Ab0DVRwb (ORCPT
- <rfc822;linux-wireless at vger.kernel.org>);
- Thu, 22 Apr 2010 13:52:31 -0400
-Received: by vws14 with SMTP id 14so38715vws.19
- for <linux-wireless at vger.kernel.org>; Thu, 22 Apr 2010 10:52:29 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=googlemail.com; s=gamma;
- h=domainkey-signature:received:received:received:received:received
- :from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid
- :content-type:content-transfer-encoding:message-id;
- bh=rH+Y7riac85RIiXG6qbakuXBSY790hWoyH0ONriCSeg=;
- b=Ykzs36TepjY445cGIr5IH3C+knJyI56PTTlTKWlRkO098l3gXlGleAI5fn2s5sivNa
- F5+SpVSoGspL0FT7yHTYb+CnZ+6ZyzshVgudsBPAakjfrZNlBYpEub3PAgddsugf9A75
- j1t9aq3UhlHL13NLQQg1mwfWsN5hUSbfjKwZQ=
-DomainKey-Signature: a=rsa-sha1; c=nofws;
- d=googlemail.com; s=gamma;
- h=from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid
- :content-type:content-transfer-encoding:message-id;
- b=ZixBFP6qSmufbPzN9DU5JjG83DMDIZFFEClBzUKD1bszfbpbEy3fsXLEFwgDchVGf2
- VpqO7MVL6R70pPqT4CGb/k2XnaFpVM3lQZK695ehjHK+X/g0nPaprPYrZu/TbPii3Ieg
- 3Dj6OuAw0/tMNg5FUfKbIlLct8v3HfpJmNVwE=
-Received: by 10.220.126.153 with SMTP id c25mr1130560vcs.140.1271958749500;
- Thu, 22 Apr 2010 10:52:29 -0700 (PDT)
-Received: from blech.mobile ([72.14.241.41])
- by mx.google.com with ESMTPS id i29sm814619vcr.12.2010.04.22.10.52.27
- (version=TLSv1/SSLv3 cipher=RC4-MD5);
- Thu, 22 Apr 2010 10:52:28 -0700 (PDT)
-Received: from blech.mobile ([127.0.0.1])
- by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id bUG7mXcCH9aE; Thu, 22 Apr 2010 19:52:17 +0200 (CEST)
-Received: from blech.mobile (localhost [127.0.0.1])
- by blech.mobile (Postfix) with ESMTP id ADBA2342417;
- Thu, 22 Apr 2010 19:52:17 +0200 (CEST)
-From: Christian Lamparter <chunkeey at googlemail.com>
-To: linux-wireless at vger.kernel.org
-Subject: [PATCH 1/2] p54pci: fix bugs in p54p_check_tx_ring
-Date: Thu, 22 Apr 2010 19:52:16 +0200
-User-Agent: KMail/1.12.4 (Linux/2.6.34-rc5-uber-wl; KDE/4.3.4; x86_64; ; )
-Cc: linville at tuxdriver.com, hdegoede at redhat.com
-MIME-Version: 1.0
-X-Length: 2052
-X-UID: 75
-Content-Type: Text/Plain;
- charset="iso-8859-1"
-Content-Transfer-Encoding: 7bit
-Message-Id: <201004221952.16857.chunkeey at googlemail.com>
-Sender: linux-wireless-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless at vger.kernel.org
-Content-Length: 1159
-
From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 22 Apr 2010 19:52:16 +0200
+Subject: [PATCH] p54pci: fix bugs in p54p_check_tx_ring
+
+commit 0250ececdf6813457c98719e2d33b3684881fde0 upstream.
Hans de Goede identified a bug in p54p_check_tx_ring:
there are two ring indices. 1 => tx data and 3 => tx management.
But the old code had a constant "1" and this resulted in spurious
-dma unmapping failures.
+dma unmapping failures.
Cc: stable at kernel.org
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=583623
Bug-Identified-by: Hans de Goede <hdegoede at redhat.com>
Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
+ drivers/net/wireless/p54/p54pci.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
-index 679da7e..cffe2f2 100644
+index ed4bdff..21f673d 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
-@@ -246,7 +246,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,
+@@ -245,7 +245,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,
u32 idx, i;
i = (*index) % ring_limit;
@@ -99,8 +32,6 @@
idx %= ring_limit;
while (i != idx) {
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
+--
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,97 +1,25 @@
-Return-Path: <linux-wireless-owner at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on dual
-X-Spam-Level:
-X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
- KB_DATE_CONTAINS_TAB autolearn=no version=3.3.1
-X-Original-To: maks at dual
-Delivered-To: maks at dual
-Received: from dual (localhost.localdomain [127.0.0.1])
- by dual (Postfix) with ESMTP id 6945624045
- for <maks at dual>; Fri, 23 Apr 2010 04:14:42 +0200 (CEST)
-X-Original-To: max at stro.at
-Delivered-To: max at stro.at
-Received: from baikonur.stro.at [213.239.196.228]
- by dual with POP3 (fetchmail-6.3.16)
- for <maks at dual> (single-drop); Fri, 23 Apr 2010 04:14:42 +0200 (CEST)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by baikonur.stro.at (Postfix) with ESMTP id 0650F5C00B
- for <max at stro.at>; Thu, 22 Apr 2010 19:45:05 +0200 (CEST)
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
- id S1755708Ab0DVRxA (ORCPT <rfc822;max at stro.at>);
- Thu, 22 Apr 2010 13:53:00 -0400
-Received: from mail-pz0-f194.google.com ([209.85.222.194]:37203 "EHLO
- mail-pz0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1755147Ab0DVRw7 (ORCPT
- <rfc822;linux-wireless at vger.kernel.org>);
- Thu, 22 Apr 2010 13:52:59 -0400
-Received: by pzk32 with SMTP id 32so5663626pzk.21
- for <linux-wireless at vger.kernel.org>; Thu, 22 Apr 2010 10:52:58 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=googlemail.com; s=gamma;
- h=domainkey-signature:received:received:received:received:received
- :from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid
- :content-type:content-transfer-encoding:message-id;
- bh=yJz+c5/JMqOxuMrxk75S5LvVDV5la+16zQVI/xQuosY=;
- b=krjzx1PwXDglH9BKcI+e7WyvVPwy284xIAAxYojJMM3AkNsVpxCyuUXkzqkrDWaN8Z
- VwzlJJFO5mYy9ZmQM+utsqENnmIEpQp2eszSxI2cfx36lKpoE71gDBkK1A+vDnClheMv
- MyFHfI869i03WhBAASw6oe1xhdI1bb4F49zmE=
-DomainKey-Signature: a=rsa-sha1; c=nofws;
- d=googlemail.com; s=gamma;
- h=from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid
- :content-type:content-transfer-encoding:message-id;
- b=kLB1kLIJwVvNYqGmlY3Ql+PqUEXjk7KvsSUZSvES9+eYqzjAQYbiuEpl40DM10BSrl
- Mtdenj+I5Ce2chMF6i1JrzzNFMFz0pUVtqUuAk9iQL9Iuo7eE7DZEOS2X3Vo4xCdRLC1
- S3ygbtj1GOb1JfYn7ge9GL39GsyCNQBRlfVuA=
-Received: by 10.141.188.24 with SMTP id q24mr1593520rvp.0.1271958778042;
- Thu, 22 Apr 2010 10:52:58 -0700 (PDT)
-Received: from blech.mobile ([72.14.240.9])
- by mx.google.com with ESMTPS id 22sm156714pzk.13.2010.04.22.10.52.55
- (version=TLSv1/SSLv3 cipher=RC4-MD5);
- Thu, 22 Apr 2010 10:52:57 -0700 (PDT)
-Received: from blech.mobile ([127.0.0.1])
- by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id vx9ld1JknfF5; Thu, 22 Apr 2010 19:52:44 +0200 (CEST)
-Received: from blech.mobile (localhost [127.0.0.1])
- by blech.mobile (Postfix) with ESMTP id 80D53342417;
- Thu, 22 Apr 2010 19:52:44 +0200 (CEST)
-From: Christian Lamparter <chunkeey at googlemail.com>
-To: linux-wireless at vger.kernel.org
-Subject: [PATCH 2/2] p54pci: fix regression from prevent stuck rx-ring on slow system
-Date: Thu, 22 Apr 2010 19:52:43 +0200
-User-Agent: KMail/1.12.4 (Linux/2.6.34-rc5-uber-wl; KDE/4.3.4; x86_64; ; )
-Cc: linville at tuxdriver.com, hdegoede at redhat.com
-MIME-Version: 1.0
-X-Length: 4801
-X-UID: 74
-Content-Type: text/plain;
- charset="iso-8859-1"
-Content-Transfer-Encoding: 7bit
-Message-Id: <201004221952.44071.chunkeey at googlemail.com>
-Sender: linux-wireless-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless at vger.kernel.org
-Content-Length: 4096
-
+From d4cde88c1c025ffa18150ec29e80e456f2a5c65a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 22 Apr 2010 19:52:43 +0200
+Subject: [PATCH] p54pci: fix regression from prevent stuck rx-ring on slow system
This patch fixes a recently introduced use-after-free regression
from "p54pci: prevent stuck rx-ring on slow system".
Hans de Goede reported a use-after-free regression:
->BUG: unable to handle kernel paging request at 6b6b6b6b
->IP: [<e122284a>] p54p_check_tx_ring+0x84/0xb1 [p54pci]
->*pde = 00000000
->Oops: 0000 [#1] SMP
->EIP: 0060:[<e122284a>] EFLAGS: 00010286 CPU: 0
->EIP is at p54p_check_tx_ring+0x84/0xb1 [p54pci]
->EAX: 6b6b6b6b EBX: df10b170 ECX: 00000003 EDX: 00000001
->ESI: dc471500 EDI: d8acaeb0 EBP: c098be9c ESP: c098be84
-> DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
->Process swapper (pid: 0, ti=c098a000 task=c09ccfe0 task.ti=c098a000)
->Call Trace:
-> [<e1222b02>] ? p54p_tasklet+0xaa/0xb5 [p54pci]
-> [<c0440568>] ? tasklet_action+0x78/0xcb
+>BUG: unable to handle kernel paging request at 6b6b6b6b
+>IP: [<e122284a>] p54p_check_tx_ring+0x84/0xb1 [p54pci]
+>*pde = 00000000
+>Oops: 0000 [#1] SMP
+>EIP: 0060:[<e122284a>] EFLAGS: 00010286 CPU: 0
+>EIP is at p54p_check_tx_ring+0x84/0xb1 [p54pci]
+>EAX: 6b6b6b6b EBX: df10b170 ECX: 00000003 EDX: 00000001
+>ESI: dc471500 EDI: d8acaeb0 EBP: c098be9c ESP: c098be84
+> DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
+>Process swapper (pid: 0, ti=c098a000 task=c09ccfe0 task.ti=c098a000)
+>Call Trace:
+> [<e1222b02>] ? p54p_tasklet+0xaa/0xb5 [p54pci]
+> [<c0440568>] ? tasklet_action+0x78/0xcb
> [<c0440ed3>] ? __do_softirq+0xbc/0x173
Quote from comment #17:
@@ -122,12 +50,16 @@
Bug-Identified-by: Hans de Goede <hdegoede at redhat.com>
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
+ drivers/net/wireless/p54/p54pci.c | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
-index ca42ccb..07c4528 100644
+index 0a516c8..fc67888 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
-@@ -277,6 +277,14 @@ static void p54p_tasklet(unsigned long dev_id)
+@@ -276,6 +276,14 @@ static void p54p_tasklet(unsigned long dev_id)
struct p54p_priv *priv = dev->priv;
struct p54p_ring_control *ring_control = priv->ring_control;
@@ -142,7 +74,7 @@
p54p_check_rx_ring(dev, &priv->rx_idx_mgmt, 2, ring_control->rx_mgmt,
ARRAY_SIZE(ring_control->rx_mgmt), priv->rx_buf_mgmt);
-@@ -285,14 +293,6 @@ static void p54p_tasklet(unsigned long dev_id)
+@@ -284,14 +292,6 @@ static void p54p_tasklet(unsigned long dev_id)
wmb();
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
@@ -157,8 +89,6 @@
}
static irqreturn_t p54p_interrupt(int irq, void *dev_id)
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
+--
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-serious-sparse-warning.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-serious-sparse-warning.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-serious-sparse-warning.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,93 +1,29 @@
-Return-Path: <linux-wireless-owner at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on dual
-X-Spam-Level:
-X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
- KB_DATE_CONTAINS_TAB autolearn=no version=3.3.1
-X-Original-To: maks at dual
-Delivered-To: maks at dual
-Received: from dual (localhost.localdomain [127.0.0.1])
- by dual (Postfix) with ESMTP id 4027E2429D
- for <maks at dual>; Thu, 15 Apr 2010 14:57:47 +0200 (CEST)
-X-Original-To: max at stro.at
-Delivered-To: max at stro.at
-Received: from baikonur.stro.at [213.239.196.228]
- by dual with POP3 (fetchmail-6.3.13)
- for <maks at dual> (single-drop); Thu, 15 Apr 2010 14:57:47 +0200 (CEST)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by baikonur.stro.at (Postfix) with ESMTP id 785425C00F
- for <max at stro.at>; Thu, 15 Apr 2010 14:09:33 +0200 (CEST)
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
- id S1752356Ab0DOMRR (ORCPT <rfc822;max at stro.at>);
- Thu, 15 Apr 2010 08:17:17 -0400
-Received: from mail-ew0-f220.google.com ([209.85.219.220]:35717 "EHLO
- mail-ew0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1752038Ab0DOMRQ (ORCPT
- <rfc822;linux-wireless at vger.kernel.org>);
- Thu, 15 Apr 2010 08:17:16 -0400
-Received: by ewy20 with SMTP id 20so459287ewy.1
- for <linux-wireless at vger.kernel.org>; Thu, 15 Apr 2010 05:17:15 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=googlemail.com; s=gamma;
- h=domainkey-signature:received:received:received:received:received
- :from:to:subject:date:user-agent:cc:mime-version:content-type
- :content-transfer-encoding:message-id;
- bh=p4STqoMJiC6z/cKYzv2Exm9RYHj8L3PhiKgV8V/My+8=;
- b=Df3+ZF5p9OAOZbcMmdGwwyRhe6KKgy9XnEhFVlpwzN2ifr78NiUNl9AwiYsHd2bCAb
- DFIq9aj2Lw3AzsJziQaRZjAyi1BCwRHWYVT1z6DAUac3GKAPDbTwg8ci9O31eyKBcbQu
- 3d//ULPy6g8NH7caloyA+ZhU8cmIl93ddMv0I=
-DomainKey-Signature: a=rsa-sha1; c=nofws;
- d=googlemail.com; s=gamma;
- h=from:to:subject:date:user-agent:cc:mime-version:content-type
- :content-transfer-encoding:message-id;
- b=n2N7kl6h8TV/cyVhTSMxV505sNe8/00nKdlLKyTn7h0M9MPZhLYgvJms0gr6wMtuoS
- t78oiQsjdGsh2YMGVes/1eMoISXolb2pGF36Lp3UnoVJtJx5s6aBasGQ0oVUc2PIYozG
- FyMOuuxhdfOyNOE8iJVAGWVBWLNxyIICBR4tU=
-Received: by 10.213.2.81 with SMTP id 17mr25407ebi.76.1271333835129;
- Thu, 15 Apr 2010 05:17:15 -0700 (PDT)
-Received: from blech.mobile (nat-wh.rz.uni-karlsruhe.de [129.13.72.197])
- by mx.google.com with ESMTPS id 15sm922586ewy.12.2010.04.15.05.17.14
- (version=TLSv1/SSLv3 cipher=RC4-MD5);
- Thu, 15 Apr 2010 05:17:14 -0700 (PDT)
-Received: from blech.mobile ([127.0.0.1])
- by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id gSWm7mhNvXD9; Thu, 15 Apr 2010 14:17:08 +0200 (CEST)
-Received: from blech.mobile (localhost [127.0.0.1])
- by blech.mobile (Postfix) with ESMTP id 6D2D834077B;
- Thu, 15 Apr 2010 14:17:08 +0200 (CEST)
From: Christian Lamparter <chunkeey at googlemail.com>
-To: linux-wireless at vger.kernel.org
+Date: Thu, 15 Apr 2010 14:17:07 +0200
Subject: [PATCH] p54pci: fix serious sparse warning
-Date: Thu, 15 Apr 2010 14:17:07 +0200
-User-Agent: KMail/1.12.4 (Linux/2.6.34-rc3-uber-wl; KDE/4.3.4; x86_64; ; )
-Cc: linville at tuxdriver.com
-MIME-Version: 1.0
-Content-Type: Text/Plain;
- charset="iso-8859-1"
-Content-Transfer-Encoding: 7bit
-Message-Id: <201004151417.07538.chunkeey at googlemail.com>
-Sender: linux-wireless-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless at vger.kernel.org
-X-Virus-Scanned: by Amavis (ClamAV) at stro.at
-Content-Length: 1202
+
+commit 103823db62ffca028c7a214c80266519d2ea7d8d upstream.
This patch fixes a bug which was just recently introduced by
("p54pci: prevent stuck rx-ring on slow system").
make M=drivers/net/wireless/p54 C=2 CF=-D__CHECK_ENDIAN__
- CHECK drivers/net/wireless/p54/p54pci.c
-drivers/net/wireless/p54/p54pci.c:143:11: warning: cast to restricted __le32
+ CHECK drivers/net/wireless/p54/p54pci.c
+drivers/net/wireless/p54/p54pci.c:143:11: warning: cast to restricted __le32
CC [M] drivers/net/wireless/p54/p54pci.o
Reported-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
+ drivers/net/wireless/p54/p54pci.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
-index 86f3e9a..679da7e 100644
+index aa29663..0a516c8 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
-@@ -140,7 +140,7 @@ static void p54p_refill_rx_ring(struct ieee80211_hw *dev,
+@@ -139,7 +139,7 @@ static void p54p_refill_rx_ring(struct ieee80211_hw *dev,
idx = le32_to_cpu(ring_control->host_idx[ring_index]);
limit = idx;
@@ -96,8 +32,6 @@
limit = ring_limit - limit;
i = idx % ring_limit;
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
+--
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From d713804c6032b95cd3035014e16fadebb9655c6f Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey at googlemail.com>
Date: Sun, 17 Jan 2010 23:19:25 +0100
Subject: [PATCH] p54pci: move tx cleanup into tasklet
+commit d713804c6032b95cd3035014e16fadebb9655c6f upstream.
+
This patch moves the tx cleanup routines out of the critical
interrupt context and into the (previously known as rx) tasklet.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-prevent-stuck-rx-ring.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-prevent-stuck-rx-ring.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-prevent-stuck-rx-ring.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,80 +1,12 @@
-Return-Path: <linux-wireless-owner at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on dual
-X-Spam-Level:
-X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
- KB_DATE_CONTAINS_TAB autolearn=no version=3.3.1
-X-Original-To: maks at dual
-Delivered-To: maks at dual
-Received: from dual (localhost.localdomain [127.0.0.1])
- by dual (Postfix) with ESMTP id 9C5E5240B2
- for <maks at dual>; Sat, 10 Apr 2010 05:40:32 +0200 (CEST)
-X-Original-To: max at stro.at
-Delivered-To: max at stro.at
-Received: from baikonur.stro.at [213.239.196.228]
- by dual with POP3 (fetchmail-6.3.13)
- for <maks at dual> (single-drop); Sat, 10 Apr 2010 05:40:32 +0200 (CEST)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by baikonur.stro.at (Postfix) with ESMTP id 57CCD5C001
- for <max at stro.at>; Fri, 9 Apr 2010 21:30:10 +0200 (CEST)
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
- id S1755774Ab0DIThv (ORCPT <rfc822;max at stro.at>);
- Fri, 9 Apr 2010 15:37:51 -0400
-Received: from mail-fx0-f223.google.com ([209.85.220.223]:53451 "EHLO
- mail-fx0-f223.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1755660Ab0DIThu (ORCPT
- <rfc822;linux-wireless at vger.kernel.org>);
- Fri, 9 Apr 2010 15:37:50 -0400
-Received: by fxm23 with SMTP id 23so3059091fxm.21
- for <linux-wireless at vger.kernel.org>; Fri, 09 Apr 2010 12:37:48 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=googlemail.com; s=gamma;
- h=domainkey-signature:received:received:received:to:subject:cc:from
- :date:mime-version:content-type:content-transfer-encoding:message-id;
- bh=/1/MkPwABrV9B+UeF6gm0FPvrdPa07zITP+BiYkzzvw=;
- b=auJ2WlRwYLTrqH7PVkjv2hQzjgsBbBZysz1x9gVsGRQoOOZ+wTxIkXHmADOz2Clurf
- qKYgHxxCHnjDu6Xb3kQiYRHAmKFE9O/sRDNyWmVXKU9eLSt47cF16hKkyVPAOs/+g2P7
- usGYv5VXGKFrTCJwhqjvUCrVeW/6sy2mne5qo=
-DomainKey-Signature: a=rsa-sha1; c=nofws;
- d=googlemail.com; s=gamma;
- h=to:subject:cc:from:date:mime-version:content-type
- :content-transfer-encoding:message-id;
- b=jVz41M1Z71WIF8rYp/LErkkyGct/5qylglZrBSMErJB5AC3su/UaeNmI6c+tEXGrmE
- RYWQDDFlrvqDy7qgL+QmxvU0RgOizjnueLLPZlD3X4dR1O7YN+CuIpK1JJ+6Roa+p2QF
- e60ozvjRK1DjNk1aahW0hpaZxRDPGrFVxtxwM=
-Received: by 10.223.6.153 with SMTP id 25mr453117faz.81.1270841868071;
- Fri, 09 Apr 2010 12:37:48 -0700 (PDT)
-Received: from debian64.daheim (p5B16D5D6.dip.t-dialin.net [91.22.213.214])
- by mx.google.com with ESMTPS id e17sm3562248fke.27.2010.04.09.12.37.42
- (version=TLSv1/SSLv3 cipher=RC4-MD5);
- Fri, 09 Apr 2010 12:37:42 -0700 (PDT)
-Received: from debian64.daheim
- ([192.168.0.4] helo=debian64.localnet ident=chuck)
- by debian64.daheim with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
- (Exim 4.71)
- (envelope-from <chunkeey at googlemail.com>)
- id 1O0K1N-0002Xr-Ua; Fri, 09 Apr 2010 21:37:41 +0200
-To: linux-wireless at vger.kernel.org
+From: Quintin Pitts <geek4linux at gmail.com>
+Date: Fri, 9 Apr 2010 21:37:38 +0200
Subject: [PATCH] p54pci: prevent stuck rx-ring on slow system
-Cc: linville at tuxdriver.com
-From: Christian Lamparter <chunkeey at googlemail.com>
-Date: Fri, 9 Apr 2010 21:37:38 +0200
-MIME-Version: 1.0
-Content-Type: Text/Plain;
- charset="iso-8859-1"
-Content-Transfer-Encoding: 7bit
-Message-Id: <201004092137.39285.chunkeey at googlemail.com>
-Sender: linux-wireless-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless at vger.kernel.org
-X-Virus-Scanned: by Amavis (ClamAV) at stro.at
-Content-Length: 4420
-From: Quintin Pitts <geek4linux at gmail.com>
+commit 5988f385b4cffa9ca72c5be0188e5f4c9ef46d82 upstream.
This patch fixes an old problem, which - under certain
circumstances - could cause the device to become
-unresponsive.
+unresponsive.
most of p54pci's rx-ring management is implemented in just
two distinct standalone functions. p54p_check_rx_ring takes
@@ -96,17 +28,11 @@
Reported-by: Quintin Pitts <geek4linux at gmail.com>
Signed-off-by: Quintin Pitts <geek4linux at gmail.com>
Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
-John,
+ drivers/net/wireless/p54/p54pci.c | 26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
-It's been nearly a week and no complains or regressions
-have been reported. Therefore I think it is now save to
-finally merge this patch... Preferably into -next, so
-bug #11386 can be closed for 2.6.34 release.
-
-Regards,
- Chr
----
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index ed4bdff..aa29663 100644
--- a/drivers/net/wireless/p54/p54pci.c
@@ -181,8 +107,6 @@
P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
P54P_READ(ring_control_base);
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
+--
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-revise-tx-locking.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-revise-tx-locking.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-revise-tx-locking.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From b92f7d30830a319148df2943b7565989494e5ad1 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey at googlemail.com>
Date: Fri, 22 Jan 2010 08:01:11 +0100
Subject: [PATCH] p54pci: revise tx locking
+commit b92f7d30830a319148df2943b7565989494e5ad1 upstream.
+
This patch continues the effort which began with:
"[PATCH] p54pci: move tx cleanup into tasklet".
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-rx-frame-length-check.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-rx-frame-length-check.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-rx-frame-length-check.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From f5300e04df78feae8107c1846dd3a9e27c071b2f Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey at googlemail.com>
Date: Mon, 18 Jan 2010 00:07:38 +0100
Subject: [PATCH] p54pci: rx frame length check
+commit f5300e04df78feae8107c1846dd3a9e27c071b2f upstream.
+
A long time ago, a user reported several crashes due to
data corruptions which are likely the result of a
not-100%-supported, or faulty? PCI bridge.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 15a69a81731d337a3d9db51692ff8704c1114f43 Mon Sep 17 00:00:00 2001
From: Shimada Hirofumi <hirofumi at flycat.org>
Date: Sun, 14 Feb 2010 04:16:16 +0900
Subject: [PATCH] p54usb: Add usbid for Corega CG-WLUSB2GT.
+commit 15a69a81731d337a3d9db51692ff8704c1114f43 upstream.
+
Signed-off-by: Shimada Hirofumi <hirofumi at flycat.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch Mon May 24 03:34:28 2010 (r15762)
@@ -2,6 +2,7 @@
Subject: [PATCH] PHY: fix typo in bcm63xx PHY driver table
Date: Fri, 9 Apr 2010 13:04:45 +0200
+commit 0de8655ab9181cbaca82aa60402b14118e06d030 upstream.
Signed-off-by: Florian Fainelli <ffainelli at freebox.fr>
---
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,104 +1,108 @@
-commit 5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809
-Author: Neil Horman <nhorman at tuxdriver.com>
-Date: Wed Apr 28 10:30:59 2010 +0000
-
- sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
-
- Ok, version 4
-
- Change Notes:
- 1) Minor cleanups, from Vlads notes
-
- Summary:
-
- Hey-
- Recently, it was reported to me that the kernel could oops in the
- following way:
-
- <5> kernel BUG at net/core/skbuff.c:91!
- <5> invalid operand: 0000 [#1]
- <5> Modules linked in: sctp netconsole nls_utf8 autofs4 sunrpc iptable_filter
- ip_tables cpufreq_powersave parport_pc lp parport vmblock(U) vsock(U) vmci(U)
- vmxnet(U) vmmemctl(U) vmhgfs(U) acpiphp dm_mirror dm_mod button battery ac md5
- ipv6 uhci_hcd ehci_hcd snd_ens1371 snd_rawmidi snd_seq_device snd_pcm_oss
- snd_mixer_oss snd_pcm snd_timer snd_page_alloc snd_ac97_codec snd soundcore
- pcnet32 mii floppy ext3 jbd ata_piix libata mptscsih mptsas mptspi mptscsi
- mptbase sd_mod scsi_mod
- <5> CPU: 0
- <5> EIP: 0060:[<c02bff27>] Not tainted VLI
- <5> EFLAGS: 00010216 (2.6.9-89.0.25.EL)
- <5> EIP is at skb_over_panic+0x1f/0x2d
- <5> eax: 0000002c ebx: c033f461 ecx: c0357d96 edx: c040fd44
- <5> esi: c033f461 edi: df653280 ebp: 00000000 esp: c040fd40
- <5> ds: 007b es: 007b ss: 0068
- <5> Process swapper (pid: 0, threadinfo=c040f000 task=c0370be0)
- <5> Stack: c0357d96 e0c29478 00000084 00000004 c033f461 df653280 d7883180
- e0c2947d
- <5> 00000000 00000080 df653490 00000004 de4f1ac0 de4f1ac0 00000004
- df653490
- <5> 00000001 e0c2877a 08000800 de4f1ac0 df653490 00000000 e0c29d2e
- 00000004
- <5> Call Trace:
- <5> [<e0c29478>] sctp_addto_chunk+0xb0/0x128 [sctp]
- <5> [<e0c2947d>] sctp_addto_chunk+0xb5/0x128 [sctp]
- <5> [<e0c2877a>] sctp_init_cause+0x3f/0x47 [sctp]
- <5> [<e0c29d2e>] sctp_process_unk_param+0xac/0xb8 [sctp]
- <5> [<e0c29e90>] sctp_verify_init+0xcc/0x134 [sctp]
- <5> [<e0c20322>] sctp_sf_do_5_1B_init+0x83/0x28e [sctp]
- <5> [<e0c25333>] sctp_do_sm+0x41/0x77 [sctp]
- <5> [<c01555a4>] cache_grow+0x140/0x233
- <5> [<e0c26ba1>] sctp_endpoint_bh_rcv+0xc5/0x108 [sctp]
- <5> [<e0c2b863>] sctp_inq_push+0xe/0x10 [sctp]
- <5> [<e0c34600>] sctp_rcv+0x454/0x509 [sctp]
- <5> [<e084e017>] ipt_hook+0x17/0x1c [iptable_filter]
- <5> [<c02d005e>] nf_iterate+0x40/0x81
- <5> [<c02e0bb9>] ip_local_deliver_finish+0x0/0x151
- <5> [<c02e0c7f>] ip_local_deliver_finish+0xc6/0x151
- <5> [<c02d0362>] nf_hook_slow+0x83/0xb5
- <5> [<c02e0bb2>] ip_local_deliver+0x1a2/0x1a9
- <5> [<c02e0bb9>] ip_local_deliver_finish+0x0/0x151
- <5> [<c02e103e>] ip_rcv+0x334/0x3b4
- <5> [<c02c66fd>] netif_receive_skb+0x320/0x35b
- <5> [<e0a0928b>] init_stall_timer+0x67/0x6a [uhci_hcd]
- <5> [<c02c67a4>] process_backlog+0x6c/0xd9
- <5> [<c02c690f>] net_rx_action+0xfe/0x1f8
- <5> [<c012a7b1>] __do_softirq+0x35/0x79
- <5> [<c0107efb>] handle_IRQ_event+0x0/0x4f
- <5> [<c01094de>] do_softirq+0x46/0x4d
-
- Its an skb_over_panic BUG halt that results from processing an init chunk in
- which too many of its variable length parameters are in some way malformed.
-
- The problem is in sctp_process_unk_param:
- if (NULL == *errp)
- *errp = sctp_make_op_error_space(asoc, chunk,
- ntohs(chunk->chunk_hdr->length));
-
- if (*errp) {
- sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
- WORD_ROUND(ntohs(param.p->length)));
- sctp_addto_chunk(*errp,
- WORD_ROUND(ntohs(param.p->length)),
- param.v);
-
- When we allocate an error chunk, we assume that the worst case scenario requires
- that we have chunk_hdr->length data allocated, which would be correct nominally,
- given that we call sctp_addto_chunk for the violating parameter. Unfortunately,
- we also, in sctp_init_cause insert a sctp_errhdr_t structure into the error
- chunk, so the worst case situation in which all parameters are in violation
- requires chunk_hdr->length+(sizeof(sctp_errhdr_t)*param_count) bytes of data.
-
- The result of this error is that a deliberately malformed packet sent to a
- listening host can cause a remote DOS, described in CVE-2010-1173:
- http://cve.mitre.org/cgi-bin/cvename.cgi?name=2010-1173
-
- I've tested the below fix and confirmed that it fixes the issue. We move to a
- strategy whereby we allocate a fixed size error chunk and ignore errors we don't
- have space to report. Tested by me successfully
-
- Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
- Acked-by: Vlad Yasevich <vladislav.yasevich at hp.com>
- Signed-off-by: David S. Miller <davem at davemloft.net>
+From: Neil Horman <nhorman at tuxdriver.com>
+Date: Wed, 28 Apr 2010 10:30:59 +0000
+Subject: [PATCH] sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
+
+commit 5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809 upstream.
+
+Ok, version 4
+
+Change Notes:
+1) Minor cleanups, from Vlads notes
+
+Summary:
+
+Hey-
+ Recently, it was reported to me that the kernel could oops in the
+following way:
+
+<5> kernel BUG at net/core/skbuff.c:91!
+<5> invalid operand: 0000 [#1]
+<5> Modules linked in: sctp netconsole nls_utf8 autofs4 sunrpc iptable_filter
+ip_tables cpufreq_powersave parport_pc lp parport vmblock(U) vsock(U) vmci(U)
+vmxnet(U) vmmemctl(U) vmhgfs(U) acpiphp dm_mirror dm_mod button battery ac md5
+ipv6 uhci_hcd ehci_hcd snd_ens1371 snd_rawmidi snd_seq_device snd_pcm_oss
+snd_mixer_oss snd_pcm snd_timer snd_page_alloc snd_ac97_codec snd soundcore
+pcnet32 mii floppy ext3 jbd ata_piix libata mptscsih mptsas mptspi mptscsi
+mptbase sd_mod scsi_mod
+<5> CPU: 0
+<5> EIP: 0060:[<c02bff27>] Not tainted VLI
+<5> EFLAGS: 00010216 (2.6.9-89.0.25.EL)
+<5> EIP is at skb_over_panic+0x1f/0x2d
+<5> eax: 0000002c ebx: c033f461 ecx: c0357d96 edx: c040fd44
+<5> esi: c033f461 edi: df653280 ebp: 00000000 esp: c040fd40
+<5> ds: 007b es: 007b ss: 0068
+<5> Process swapper (pid: 0, threadinfo=c040f000 task=c0370be0)
+<5> Stack: c0357d96 e0c29478 00000084 00000004 c033f461 df653280 d7883180
+e0c2947d
+<5> 00000000 00000080 df653490 00000004 de4f1ac0 de4f1ac0 00000004
+df653490
+<5> 00000001 e0c2877a 08000800 de4f1ac0 df653490 00000000 e0c29d2e
+00000004
+<5> Call Trace:
+<5> [<e0c29478>] sctp_addto_chunk+0xb0/0x128 [sctp]
+<5> [<e0c2947d>] sctp_addto_chunk+0xb5/0x128 [sctp]
+<5> [<e0c2877a>] sctp_init_cause+0x3f/0x47 [sctp]
+<5> [<e0c29d2e>] sctp_process_unk_param+0xac/0xb8 [sctp]
+<5> [<e0c29e90>] sctp_verify_init+0xcc/0x134 [sctp]
+<5> [<e0c20322>] sctp_sf_do_5_1B_init+0x83/0x28e [sctp]
+<5> [<e0c25333>] sctp_do_sm+0x41/0x77 [sctp]
+<5> [<c01555a4>] cache_grow+0x140/0x233
+<5> [<e0c26ba1>] sctp_endpoint_bh_rcv+0xc5/0x108 [sctp]
+<5> [<e0c2b863>] sctp_inq_push+0xe/0x10 [sctp]
+<5> [<e0c34600>] sctp_rcv+0x454/0x509 [sctp]
+<5> [<e084e017>] ipt_hook+0x17/0x1c [iptable_filter]
+<5> [<c02d005e>] nf_iterate+0x40/0x81
+<5> [<c02e0bb9>] ip_local_deliver_finish+0x0/0x151
+<5> [<c02e0c7f>] ip_local_deliver_finish+0xc6/0x151
+<5> [<c02d0362>] nf_hook_slow+0x83/0xb5
+<5> [<c02e0bb2>] ip_local_deliver+0x1a2/0x1a9
+<5> [<c02e0bb9>] ip_local_deliver_finish+0x0/0x151
+<5> [<c02e103e>] ip_rcv+0x334/0x3b4
+<5> [<c02c66fd>] netif_receive_skb+0x320/0x35b
+<5> [<e0a0928b>] init_stall_timer+0x67/0x6a [uhci_hcd]
+<5> [<c02c67a4>] process_backlog+0x6c/0xd9
+<5> [<c02c690f>] net_rx_action+0xfe/0x1f8
+<5> [<c012a7b1>] __do_softirq+0x35/0x79
+<5> [<c0107efb>] handle_IRQ_event+0x0/0x4f
+<5> [<c01094de>] do_softirq+0x46/0x4d
+
+Its an skb_over_panic BUG halt that results from processing an init chunk in
+which too many of its variable length parameters are in some way malformed.
+
+The problem is in sctp_process_unk_param:
+if (NULL == *errp)
+ *errp = sctp_make_op_error_space(asoc, chunk,
+ ntohs(chunk->chunk_hdr->length));
+
+ if (*errp) {
+ sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
+ WORD_ROUND(ntohs(param.p->length)));
+ sctp_addto_chunk(*errp,
+ WORD_ROUND(ntohs(param.p->length)),
+ param.v);
+
+When we allocate an error chunk, we assume that the worst case scenario requires
+that we have chunk_hdr->length data allocated, which would be correct nominally,
+given that we call sctp_addto_chunk for the violating parameter. Unfortunately,
+we also, in sctp_init_cause insert a sctp_errhdr_t structure into the error
+chunk, so the worst case situation in which all parameters are in violation
+requires chunk_hdr->length+(sizeof(sctp_errhdr_t)*param_count) bytes of data.
+
+The result of this error is that a deliberately malformed packet sent to a
+listening host can cause a remote DOS, described in CVE-2010-1173:
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=2010-1173
+
+I've tested the below fix and confirmed that it fixes the issue. We move to a
+strategy whereby we allocate a fixed size error chunk and ignore errors we don't
+have space to report. Tested by me successfully
+
+Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
+Acked-by: Vlad Yasevich <vladislav.yasevich at hp.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ include/net/sctp/structs.h | 1 +
+ net/sctp/sm_make_chunk.c | 62 ++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index ff30177..597f8e2 100644
@@ -216,3 +220,6 @@
WORD_ROUND(ntohs(param.p->length)),
param.v);
} else {
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Add-workspace-for-GMAC-bug-workaround.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Add-workspace-for-GMAC-bug-workaround.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Add-workspace-for-GMAC-bug-workaround.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 8704a2c8e9db24157a7b08d1678bf840f2318779 Mon Sep 17 00:00:00 2001
From: Guido Barzini <gbarzini at solarflare.com>
Date: Mon, 25 Jan 2010 15:49:19 -0800
Subject: [PATCH 4/5] sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer
+commit 8704a2c8e9db24157a7b08d1678bf840f2318779 upstream.
+
Due to a hardware bug in the SFC9000 family, the firmware must
transfer raw GMAC statistics to host memory before aggregating them
into the cooked (speed-independent) MAC statistics. Extend the stats
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Disable-TX-descriptor-prefetch-watchdog.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Disable-TX-descriptor-prefetch-watchdog.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Disable-TX-descriptor-prefetch-watchdog.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 286d47ba90315a871f77351f7f61b7e4a96476a9 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed, 23 Dec 2009 13:49:13 +0000
Subject: [PATCH 8/8] sfc: Disable TX descriptor prefetch watchdog
+commit 286d47ba90315a871f77351f7f61b7e4a96476a9 upstream.
+
This hardware watchdog can misfire, so it does more harm than good.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-DMA-mapping-cleanup-on-error-in-TSO.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-DMA-mapping-cleanup-on-error-in-TSO.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-DMA-mapping-cleanup-on-error-in-TSO.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From a7ebd27a13757248863cd61e541af7fa9e7727ee Mon Sep 17 00:00:00 2001
From: Neil Turton <nturton at solarflare.com>
Date: Wed, 23 Dec 2009 13:47:13 +0000
Subject: [PATCH 3/8] sfc: Fix DMA mapping cleanup in case of an error in TSO
+commit a7ebd27a13757248863cd61e541af7fa9e7727ee upstream.
+
We need buffer->len to remain valid to work out the correct address to
be unmapped. We therefore need to clear buffer->len after the unmap
operation.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-SFE4002-initialisation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-SFE4002-initialisation.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-SFE4002-initialisation.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 Mon Sep 17 00:00:00 2001
From: Steve Hodgson <shodgson at solarflare.com>
Date: Fri, 12 Feb 2010 12:32:27 -0800
Subject: [PATCH 1/3] sfc: Fix SFE4002 initialisation
+commit 5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 upstream.
+
From: Steve Hodgson <shodgson at solarflare.com>
Commit 357d46a17e54c9a87e0e6ef3930ff4ab2d232b81 "sfc: QT202x: Remove
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-conditions-for-MDIO-self-test.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-conditions-for-MDIO-self-test.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-conditions-for-MDIO-self-test.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From f3766c26a5d00189e5c0965c66f01956d15a92d6 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed, 13 Jan 2010 10:59:13 +0000
Subject: [PATCH 2/5] sfc: Fix conditions for MDIO self-test
+commit f3766c26a5d00189e5c0965c66f01956d15a92d6 upstream.
+
The MDIO self-test should not be run on boards without an MDIO PHY,
such as SFN5122F-R3 and later revisions. It should also not try to
address a specific MMD in an MDIO clause 22 PHY. Check the
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-polling-for-slow-MCDI-operations.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-polling-for-slow-MCDI-operations.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-polling-for-slow-MCDI-operations.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 55029c1d65158aea9672c5dfadb43a57f23e3100 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed, 13 Jan 2010 04:34:25 +0000
Subject: [PATCH 1/5] sfc: Fix polling for slow MCDI operations
+commit 55029c1d65158aea9672c5dfadb43a57f23e3100 upstream.
+
When the interface is down and we are using polled mode for MCDI
operations, we busy-wait for completion for approximately 1 jiffy
using udelay() and then back off to schedule(). But the completion
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-sign-of-efx_mcdi_poll_reboot-error-in-efx_mcdi_poll.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-sign-of-efx_mcdi_poll_reboot-error-in-efx_mcdi_poll.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Fix-sign-of-efx_mcdi_poll_reboot-error-in-efx_mcdi_poll.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From e0bf54c93a15c365a37cfc4fe0137f5bc012d1b9 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Fri, 19 Feb 2010 13:29:27 +0000
Subject: [PATCH 2/3] sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()
+commit e0bf54c93a15c365a37cfc4fe0137f5bc012d1b9 upstream.
+
efx_mcdi_poll() uses positive error numbers, matching the MCDI
protocol. It must negate the result of efx_mcdi_poll_reboot() which
returns the usual negative error numbers.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Include-XGXS-in-XMAC-link-status-check.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Include-XGXS-in-XMAC-link-status-check.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Include-XGXS-in-XMAC-link-status-check.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From a355020af415947c7dee7e00a91360d11b6a9b47 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed, 23 Dec 2009 13:46:47 +0000
Subject: [PATCH 2/8] sfc: Include XGXS in XMAC link status check except in XGMII loopback
+commit a355020af415947c7dee7e00a91360d11b6a9b47 upstream.
+
The XGXS block may not get a link immediately in XGXS or XAUI loopback
modes, so we still need to check it. Split falcon_xaui_link_ok() into
falcon_xgxs_link_ok(), which checks only the Falcon XGXS block, and
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Move-PHY-software-state-initialisation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Move-PHY-software-state-initialisation.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Move-PHY-software-state-initialisation.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4 Mon Sep 17 00:00:00 2001
From: Steve Hodgson <shodgson at solarflare.com>
Date: Wed, 23 Dec 2009 13:46:36 +0000
Subject: [PATCH 1/8] sfc: Move PHY software state initialisation from init() into probe()
+commit ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4 upstream.
+
This prevents efx->link_advertising from being blatted during
a reset.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Add-error-message-for-suspected-bad-SFP-cable.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Add-error-message-for-suspected-bad-SFP-cable.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Add-error-message-for-suspected-bad-SFP-cable.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 50d6ec552bdd4d9227fe9ed2bac819eced3170ac Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed, 23 Dec 2009 13:48:42 +0000
Subject: [PATCH 7/8] sfc: QT2025C: Add error message for suspected bad SFP+ cables
+commit 50d6ec552bdd4d9227fe9ed2bac819eced3170ac upstream.
+
Some cables have EEPROMs that conflict with the PHY's on-board EEPROM
so it cannot load firmware.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Switch-into-self-configure-mode.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Switch-into-self-configure-mode.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Switch-into-self-configure-mode.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 0d83b2f64c330ee3892cb3117ac5d56e97185ecf Mon Sep 17 00:00:00 2001
From: Matthew Slattery <mslattery at solarflare.com>
Date: Wed, 23 Dec 2009 13:48:04 +0000
Subject: [PATCH 5/8] sfc: QT2025C: Switch into self-configure mode when not in loopback
+commit 0d83b2f64c330ee3892cb3117ac5d56e97185ecf upstream.
+
The PHY boots in a mode which is not necessarily optimal. This change
switches it to self-configure mode (except when in loopback, which
won't work in that mode if an SFP+ module is not present) by rebooting
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-bug.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-bug.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-bug.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 17d6aeafe9d8268612d91edc0102659edb382282 Mon Sep 17 00:00:00 2001
From: Matthew Slattery <mslattery at solarflare.com>
Date: Wed, 23 Dec 2009 13:47:37 +0000
Subject: [PATCH 4/8] sfc: QT2025C: Work around PHY bug
+commit 17d6aeafe9d8268612d91edc0102659edb382282 upstream.
+
If we see the PHY remaining stuck in a link-down state due to PCS being
down while PMA/PMD is up, we briefly switch to PMA/PMD loopback and back,
which usually unsticks it.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-firmware-initialisation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-firmware-initialisation.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-firmware-initialisation.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 1a1284ef97ca79ba747d211b697e996a248a8555 Mon Sep 17 00:00:00 2001
From: Matthew Slattery <mslattery at solarflare.com>
Date: Wed, 23 Dec 2009 13:48:32 +0000
Subject: [PATCH 6/8] sfc: QT2025C: Work around PHY firmware initialisation bug
+commit 1a1284ef97ca79ba747d211b697e996a248a8555 upstream.
+
The PHY's firmware very occasionally appears to lock up very early, but
with the heartbeat update still running. Rebooting the microcontroller
core seems to be sufficient to recover.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT202x-Remove-unreliable-MMD-check.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT202x-Remove-unreliable-MMD-check.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-QT202x-Remove-unreliable-MMD-check.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 357d46a17e54c9a87e0e6ef3930ff4ab2d232b81 Mon Sep 17 00:00:00 2001
From: Matthew Slattery <mslattery at solarflare.com>
Date: Mon, 18 Jan 2010 05:47:16 +0000
Subject: [PATCH 3/5] sfc: QT202x: Remove unreliable MMD check at initialisation
+commit 357d46a17e54c9a87e0e6ef3930ff4ab2d232b81 upstream.
+
Checking the PHY XS MMD here is unnecessary and can give false negatives.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-SFE4002-SFN4112F-Widen-temperature-voltage-tolerances.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-SFE4002-SFN4112F-Widen-temperature-voltage-tolerances.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-SFE4002-SFN4112F-Widen-temperature-voltage-tolerances.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 242cc0547f3bcecc0b02ca6f3e9512760185727e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Fri, 19 Feb 2010 13:34:03 +0000
Subject: [PATCH 3/3] sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances
+commit 242cc0547f3bcecc0b02ca6f3e9512760185727e upstream.
+
The temperature and voltage limits currently set on these boards are
too conservative and will cause the driver to stop the net device
erroneously in some systems.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Use-fixed-size-buffers-for-MCDI-NVRAM-requests.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Use-fixed-size-buffers-for-MCDI-NVRAM-requests.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sfc-Use-fixed-size-buffers-for-MCDI-NVRAM-requests.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 5a27e86babe79cf5f575394bb1055448458df6c7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings at solarflare.com>
Date: Mon, 25 Jan 2010 15:49:59 -0800
Subject: [PATCH 5/5] sfc: Use fixed-size buffers for MCDI NVRAM requests
+commit 5a27e86babe79cf5f575394bb1055448458df6c7 upstream.
+
The low-level MCDI code always uses 32-bit MMIO operations, and
callers must pad input and output buffers to multiples of 4 bytes.
The MCDI NVRAM functions are not doing this. Also, their buffers are
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,67 +1,72 @@
-commit d0021b252eaf65ca07ed14f0d66425dd9ccab9a6
-Author: Neil Horman <nhorman at tuxdriver.com>
-Date: Wed Mar 3 08:31:23 2010 +0000
-
- tipc: Fix oops on send prior to entering networked mode (v3)
-
- Fix TIPC to disallow sending to remote addresses prior to entering NET_MODE
-
- user programs can oops the kernel by sending datagrams via AF_TIPC prior to
- entering networked mode. The following backtrace has been observed:
-
- ID: 13459 TASK: ffff810014640040 CPU: 0 COMMAND: "tipc-client"
- [exception RIP: tipc_node_select_next_hop+90]
- RIP: ffffffff8869d3c3 RSP: ffff81002d9a5ab8 RFLAGS: 00010202
- RAX: 0000000000000001 RBX: 0000000000000001 RCX: 0000000000000001
- RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000001001001
- RBP: 0000000001001001 R8: 0074736575716552 R9: 0000000000000000
- R10: ffff81003fbd0680 R11: 00000000000000c8 R12: 0000000000000008
- R13: 0000000000000001 R14: 0000000000000001 R15: ffff810015c6ca00
- ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
- RIP: 0000003cbd8d49a3 RSP: 00007fffc84e0be8 RFLAGS: 00010206
- RAX: 000000000000002c RBX: ffffffff8005d116 RCX: 0000000000000000
- RDX: 0000000000000008 RSI: 00007fffc84e0c00 RDI: 0000000000000003
- RBP: 0000000000000000 R8: 00007fffc84e0c10 R9: 0000000000000010
- R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
- R13: 00007fffc84e0d10 R14: 0000000000000000 R15: 00007fffc84e0c30
- ORIG_RAX: 000000000000002c CS: 0033 SS: 002b
-
- What happens is that, when the tipc module in inserted it enters a standalone
- node mode in which communication to its own address is allowed <0.0.0> but not
- to other addresses, since the appropriate data structures have not been
- allocated yet (specifically the tipc_net pointer). There is nothing stopping a
- client from trying to send such a message however, and if that happens, we
- attempt to dereference tipc_net.zones while the pointer is still NULL, and
- explode. The fix is pretty straightforward. Since these oopses all arise from
- the dereference of global pointers prior to their assignment to allocated
- values, and since these allocations are small (about 2k total), lets convert
- these pointers to static arrays of the appropriate size. All the accesses to
- these bits consider 0/NULL to be a non match when searching, so all the lookups
- still work properly, and there is no longer a chance of a bad dererence
- anywhere. As a bonus, this lets us eliminate the setup/teardown routines for
- those pointers, and elimnates the need to preform any locking around them to
- prevent access while their being allocated/freed.
-
- I've updated the tipc_net structure to behave this way to fix the exact reported
- problem, and also fixed up the tipc_bearers and media_list arrays to fix an
- obvious simmilar problem that arises from issuing tipc-config commands to
- manipulate bearers/links prior to entering networked mode
-
- I've tested this for a few hours by running the sanity tests and stress test
- with the tipcutils suite, and nothing has fallen over. There have been a few
- lockdep warnings, but those were there before, and can be addressed later, as
- they didn't actually result in any deadlock.
-
- Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
- CC: Allan Stephens <allan.stephens at windriver.com>
- CC: David S. Miller <davem at davemloft.net>
- CC: tipc-discussion at lists.sourceforge.net
-
- bearer.c | 37 ++++++-------------------------------
- bearer.h | 2 +-
- net.c | 25 ++++---------------------
- 3 files changed, 11 insertions(+), 53 deletions(-)
- Signed-off-by: David S. Miller <davem at davemloft.net>
+From: Neil Horman <nhorman at tuxdriver.com>
+Date: Wed, 3 Mar 2010 08:31:23 +0000
+Subject: [PATCH] tipc: Fix oops on send prior to entering networked mode (v3)
+
+commit d0021b252eaf65ca07ed14f0d66425dd9ccab9a6 upstream.
+
+Fix TIPC to disallow sending to remote addresses prior to entering NET_MODE
+
+user programs can oops the kernel by sending datagrams via AF_TIPC prior to
+entering networked mode. The following backtrace has been observed:
+
+ID: 13459 TASK: ffff810014640040 CPU: 0 COMMAND: "tipc-client"
+[exception RIP: tipc_node_select_next_hop+90]
+RIP: ffffffff8869d3c3 RSP: ffff81002d9a5ab8 RFLAGS: 00010202
+RAX: 0000000000000001 RBX: 0000000000000001 RCX: 0000000000000001
+RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000001001001
+RBP: 0000000001001001 R8: 0074736575716552 R9: 0000000000000000
+R10: ffff81003fbd0680 R11: 00000000000000c8 R12: 0000000000000008
+R13: 0000000000000001 R14: 0000000000000001 R15: ffff810015c6ca00
+ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
+RIP: 0000003cbd8d49a3 RSP: 00007fffc84e0be8 RFLAGS: 00010206
+RAX: 000000000000002c RBX: ffffffff8005d116 RCX: 0000000000000000
+RDX: 0000000000000008 RSI: 00007fffc84e0c00 RDI: 0000000000000003
+RBP: 0000000000000000 R8: 00007fffc84e0c10 R9: 0000000000000010
+R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
+R13: 00007fffc84e0d10 R14: 0000000000000000 R15: 00007fffc84e0c30
+ORIG_RAX: 000000000000002c CS: 0033 SS: 002b
+
+What happens is that, when the tipc module in inserted it enters a standalone
+node mode in which communication to its own address is allowed <0.0.0> but not
+to other addresses, since the appropriate data structures have not been
+allocated yet (specifically the tipc_net pointer). There is nothing stopping a
+client from trying to send such a message however, and if that happens, we
+attempt to dereference tipc_net.zones while the pointer is still NULL, and
+explode. The fix is pretty straightforward. Since these oopses all arise from
+the dereference of global pointers prior to their assignment to allocated
+values, and since these allocations are small (about 2k total), lets convert
+these pointers to static arrays of the appropriate size. All the accesses to
+these bits consider 0/NULL to be a non match when searching, so all the lookups
+still work properly, and there is no longer a chance of a bad dererence
+anywhere. As a bonus, this lets us eliminate the setup/teardown routines for
+those pointers, and elimnates the need to preform any locking around them to
+prevent access while their being allocated/freed.
+
+I've updated the tipc_net structure to behave this way to fix the exact reported
+problem, and also fixed up the tipc_bearers and media_list arrays to fix an
+obvious simmilar problem that arises from issuing tipc-config commands to
+manipulate bearers/links prior to entering networked mode
+
+I've tested this for a few hours by running the sanity tests and stress test
+with the tipcutils suite, and nothing has fallen over. There have been a few
+lockdep warnings, but those were there before, and can be addressed later, as
+they didn't actually result in any deadlock.
+
+Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
+CC: Allan Stephens <allan.stephens at windriver.com>
+CC: David S. Miller <davem at davemloft.net>
+CC: tipc-discussion at lists.sourceforge.net
+
+ bearer.c | 37 ++++++-------------------------------
+ bearer.h | 2 +-
+ net.c | 25 ++++---------------------
+ 3 files changed, 11 insertions(+), 53 deletions(-)
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/tipc/bearer.c | 37 ++++++-------------------------------
+ net/tipc/bearer.h | 2 +-
+ net/tipc/net.c | 25 ++++---------------------
+ 3 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 327011f..7809137 100644
@@ -207,3 +212,6 @@
(res = tipc_bclink_init())) {
return res;
}
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,6 +1,8 @@
From: Ben Hutchings <ben at decadent.org.uk>
Subject: [PATCH] usbnet: Set link down initially for drivers that update link state
+commit 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 upstream.
+
Some usbnet drivers update link state while others do not due to
hardware limitations. Add a flag to distinguish those that do, and
set the link down initially for their devices.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-incorrect-dereference-of-userspace-pointe.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-incorrect-dereference-of-userspace-pointe.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-incorrect-dereference-of-userspace-pointe.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 77c1ff3982c6b36961725dd19e872a1c07df7f3b Mon Sep 17 00:00:00 2001
From: Andy Getzendanner <james.getzendanner at students.olin.edu>
Date: Thu, 11 Feb 2010 14:04:48 +1000
Subject: [PATCH] vgaarb: fix incorrect dereference of userspace pointer.
+commit 77c1ff3982c6b36961725dd19e872a1c07df7f3b upstream.
+
This patch corrects a userspace pointer dereference in the VGA arbiter
in 2.6.32.1.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 2cc9116c2b37c525965d76a3e6def38913259427 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at redhat.com>
Date: Tue, 16 Feb 2010 16:18:37 -0500
Subject: [PATCH] vgaarb: fix "target=default" passing
+commit 2cc9116c2b37c525965d76a3e6def38913259427 upstream.
+
Commit 77c1ff3982c6b36961725dd19e872a1c07df7f3b fixed the userspace
pointer dereference, but introduced another bug pointed out by Eugene Teo
in RH bug #564264. Instead of comparing the point we were at in the string,
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,6 +1,9 @@
From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 14 Dec 2009 16:05:09 +0000
Subject: [PATCH] via-velocity: Give RX descriptors to the NIC later on open or MTU change
+commit 35bb5cadc8c7b1462df57e32e08d964f1be7a75c upstream.
+
velocity_open() calls velocity_give_many_rx_descs(), which gives RX
descriptors to the NIC, before installing an interrupt handler or
calling velocity_init_registers(). I think this is very unsafe and it
@@ -13,6 +16,15 @@
Therefore, move the calls to velocity_give_many_rx_descs() after
request_irq() and velocity_init_registers().
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Tested-by: Jan Ceuleers <jan.ceuleers at computer.org>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/via-velocity.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
+index 4ceb441..c93f58f 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2237,8 +2237,6 @@ static int velocity_open(struct net_device *dev)
@@ -33,3 +45,6 @@
mac_enable_int(vptr->mac_regs);
netif_start_queue(dev);
napi_enable(&vptr->napi);
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From a8b1925430339be1464a9a028754d94984dacfdb Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Wed, 10 Mar 2010 15:21:49 -0800
Subject: [PATCH] video: fix first line of kernel-doc for a few functions
+commit a8b1925430339be1464a9a028754d94984dacfdb upstream.
+
The function name must be followed by a space, hypen, space, and a short
description.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/virtio_net-Make-delayed-refill-more-reliable.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/virtio_net-Make-delayed-refill-more-reliable.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/virtio_net-Make-delayed-refill-more-reliable.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 39d321577405e8e269fd238b278aaf2425fa788a Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: Mon, 25 Jan 2010 15:51:01 -0800
Subject: [PATCH] virtio_net: Make delayed refill more reliable
+commit 39d321577405e8e269fd238b278aaf2425fa788a upstream.
+
I have seen RX stalls on a machine that experienced a suspected
OOM. After the stall, the RX buffer is empty on the guest side
and there are exactly 16 entries available on the host side. As
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/vlan-macvlan-propagate-transmission-state-to-upper-layer.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/vlan-macvlan-propagate-transmission-state-to-upper-layer.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/vlan-macvlan-propagate-transmission-state-to-upper-layer.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From cbbef5e183079455763fc470ccf69008f92ab4b6 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber at trash.net>
Date: Tue, 10 Nov 2009 06:14:24 +0000
Subject: [PATCH] vlan/macvlan: propagate transmission state to upper layers
+commit cbbef5e183079455763fc470ccf69008f92ab4b6 upstream.
+
Both vlan and macvlan devices usually don't use a qdisc and immediately
queue packets to the underlying device. Propagate transmission state of
the underlying device to the upper layers so they can react on congestion
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,13 +1,19 @@
From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
-Subject: mips: enable PATA platform on SWARM and LITTLESUR
+Date: Sun, 18 Apr 2010 15:26:36 +0200
+Subject: [PATCH] MIPS: Swarm, Littlesur: Enable PATA platform driver.
-according to include/asm/sibyte/swarm.h both systems provide a
+commit fcf3ca4c3d6d911df8ee2b8f010ffe504d3aef71 upstream.
+
+According to include/asm/sibyte/swarm.h both systems provide a
platform device for the ide controler. Until now the IDE subsystem was
used which is deprecated by now. The same structure can be used with the
PATA driver.
-This was tested on SWARM.
Signed-off-by: Sebastian Andrzej Siewior <sebatian at breakpoint.cc>
+Cc: tbm at cyrius.com
+Cc: linux-mips at linux-mips.org
+Patchwork: http://patchwork.linux-mips.org/patch/1127/
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
---
arch/mips/Kconfig | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
@@ -16,7 +22,7 @@
index 29e8692..98628ec 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -499,6 +500,7 @@ config SIBYTE_SWARM
+@@ -509,6 +509,7 @@ config SIBYTE_SWARM
bool "Sibyte BCM91250A-SWARM"
select BOOT_ELF32
select DMA_COHERENT
@@ -24,7 +30,7 @@
select NR_CPUS_DEFAULT_2
select SIBYTE_SB1250
select SWAP_IO_SPACE
-@@ -513,6 +514,7 @@ config SIBYTE_LITTLESUR
+@@ -523,6 +524,7 @@ config SIBYTE_LITTLESUR
depends on EXPERIMENTAL
select BOOT_ELF32
select DMA_COHERENT
@@ -33,4 +39,5 @@
select SIBYTE_SB1250
select SWAP_IO_SPACE
--
-1.6.6.1
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/fpu-emulator.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/fpu-emulator.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/fpu-emulator.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,44 +1,47 @@
From: Shane McDonald <mcdonald.shane at gmail.com>
-Date: Fri, 7 May 2010 05:26:57 +0000 (-0600)
-Subject: MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
-X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=2c8fb481214e608f6b9a71aa85651d9ddf7fd6e4
-
-MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
-
-In the FPU emulator code of the MIPS, the Cause bits of the FCSR register
-are not currently writeable by the ctc1 instruction. In odd corner cases,
-this can cause problems. For example, a case existed where a divide-by-zero
-exception was generated by the FPU, and the signal handler attempted to
-restore the FPU registers to their state before the exception occurred. In
-this particular setup, writing the old value to the FCSR register would
-cause another divide-by-zero exception to occur immediately. The solution
-is to change the ctc1 instruction emulator code to allow the Cause bits of
-the FCSR register to be writeable. This is the behaviour of the hardware
-that the code is emulating.
-
-This problem was found by Shane McDonald, but the credit for the fix goes
-to Kevin Kissell. In Kevin's words:
-
-I submit that the bug is indeed in that ctc_op: case of the emulator. The
-Cause bits (17:12) are supposed to be writable by that instruction, but the
-CTC1 emulation won't let them be updated by the instruction. I think that
-actually if you just completely removed lines 387-388 [...] things would
-work a good deal better. At least, it would be a more accurate emulation of
-the architecturally defined FPU. If I wanted to be really, really pedantic
-(which I sometimes do), I'd also protect the reserved bits that aren't
-necessarily writable.
-
-Signed-off-by: Shane McDonald <mcdonald.shane at gmail.com>
-To: anemo at mba.ocn.ne.jp
-To: kevink at paralogos.com
-To: sshtylyov at mvista.com
-Patchwork: http://patchwork.linux-mips.org/patch/1205/
-Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
-(cherry picked from commit 635be78c7c80d4c61f0f16b6132a730d7668cb43)
+Date: Thu, 6 May 2010 23:26:57 -0600
+Subject: [PATCH] MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
+
+commit 95e8f634d7a3ea5af40ec3fa42c8a152fd3a0624 upstream.
+
+ In the FPU emulator code of the MIPS, the Cause bits of the FCSR register
+ are not currently writeable by the ctc1 instruction. In odd corner cases,
+ this can cause problems. For example, a case existed where a divide-by-zero
+ exception was generated by the FPU, and the signal handler attempted to
+ restore the FPU registers to their state before the exception occurred. In
+ this particular setup, writing the old value to the FCSR register would
+ cause another divide-by-zero exception to occur immediately. The solution
+ is to change the ctc1 instruction emulator code to allow the Cause bits of
+ the FCSR register to be writeable. This is the behaviour of the hardware
+ that the code is emulating.
+
+ This problem was found by Shane McDonald, but the credit for the fix goes
+ to Kevin Kissell. In Kevin's words:
+
+ I submit that the bug is indeed in that ctc_op: case of the emulator. The
+ Cause bits (17:12) are supposed to be writable by that instruction, but the
+ CTC1 emulation won't let them be updated by the instruction. I think that
+ actually if you just completely removed lines 387-388 [...] things would
+ work a good deal better. At least, it would be a more accurate emulation of
+ the architecturally defined FPU. If I wanted to be really, really pedantic
+ (which I sometimes do), I'd also protect the reserved bits that aren't
+ necessarily writable.
+
+ Signed-off-by: Shane McDonald <mcdonald.shane at gmail.com>
+ To: anemo at mba.ocn.ne.jp
+ To: kevink at paralogos.com
+ To: sshtylyov at mvista.com
+ Patchwork: http://patchwork.linux-mips.org/patch/1205/
+ Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+
---
+---
+ arch/mips/include/asm/mipsregs.h | 9 ++++++++-
+ arch/mips/math-emu/cp1emu.c | 15 +++++++++++----
+ 2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
-index a581d60..608dc97 100644
+index 49382d5..c6e3c93 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -135,6 +135,12 @@
@@ -65,10 +68,10 @@
#define FPU_CSR_RZ 0x1 /* towards zero */
#define FPU_CSR_RU 0x2 /* towards +Infinity */
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 454b539..c15d94b 100644
+index 8f2f8e9..f2338d1 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
-@@ -75,6 +75,9 @@ struct mips_fpu_emulator_stats fpuemustats;
+@@ -78,6 +78,9 @@ DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
#define FPCREG_RID 0 /* $0 = revision id */
#define FPCREG_CSR 31 /* $31 = csr */
@@ -78,7 +81,7 @@
/* Convert Mips rounding mode (0..3) to IEEE library modes. */
static const unsigned char ieee_rm[4] = {
[FPU_CSR_RN] = IEEE754_RN,
-@@ -381,10 +384,14 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
+@@ -384,10 +387,14 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
(void *) (xcp->cp0_epc),
MIPSInst_RT(ir), value);
#endif
@@ -97,3 +100,6 @@
}
if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
return SIGFPE;
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,26 +1,23 @@
-commit 56151e753468e34aeb322af4b0309ab727c97d2e
-Author: Wufei <fei.wu at windriver.com>
-Date: Wed Apr 28 17:42:32 2010 -0400
+From: Wufei <fei.wu at windriver.com>
+Date: Wed, 28 Apr 2010 17:42:32 -0400
+Subject: [PATCH] kgdb: don't needlessly skip PAGE_USER test for Fsl booke
- kgdb: don't needlessly skip PAGE_USER test for Fsl booke
-
- The bypassing of this test is a leftover from 2.4 vintage
- kernels, and is no longer appropriate, or even used by KGDB.
- Currently KGDB uses probe_kernel_write() for all access to
- memory via the KGDB core, so it can simply be deleted.
-
- This fixes CVE-2010-1446.
-
- CC: Benjamin Herrenschmidt <benh at kernel.crashing.org>
- CC: Paul Mackerras <paulus at samba.org>
- CC: Kumar Gala <galak at kernel.crashing.org>
- Signed-off-by: Wufei <fei.wu at windriver.com>
- Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
+commit 56151e753468e34aeb322af4b0309ab727c97d2e upstream.
+The bypassing of this test is a leftover from 2.4 vintage
+kernels, and is no longer appropriate, or even used by KGDB.
+Currently KGDB uses probe_kernel_write() for all access to
+memory via the KGDB core, so it can simply be deleted.
-Adjusted to apply to Debian's 2.6.32 by dann frazier <dannf at debian.org>
-
+This fixes CVE-2010-1446.
+CC: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+CC: Paul Mackerras <paulus at samba.org>
+CC: Kumar Gala <galak at kernel.crashing.org>
+Signed-off-by: Wufei <fei.wu at windriver.com>
+Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
+Adjusted to apply to Debian's 2.6.32 by dann frazier <dannf at debian.org>
+---
diff -urpN a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
--- a/arch/powerpc/mm/fsl_booke_mmu.c 2009-12-02 20:51:21.000000000 -0700
+++ b/arch/powerpc/mm/fsl_booke_mmu.c 2010-04-30 00:49:04.000000000 -0600
Modified: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,3 +1,5 @@
+Revert commit 5faae2e5d1f53df9dce482032c8486bc3a1feffc "[POWERPC] Always add preferred consoles in platforms/pseries/lpar.c"
+
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 9235c46..8a20452 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
Modified: dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-use-of-uid16_t-and-gid16_t.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-use-of-uid16_t-and-gid16_t.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-use-of-uid16_t-and-gid16_t.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,14 +1,14 @@
From: Rob Landley <rob at landley.net>
-Date: Sat, 27 Mar 2010 15:36:18 +0000 (-0700)
-Subject: sparc: Fix use of uid16_t and gid16_t in asm/stat.h
-X-Git-Tag: v2.6.34-rc3~10^2~2
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7469a9acf919d36836f6c635099d8edc9be4528a
+Date: Sat, 27 Mar 2010 08:36:18 -0700
+Subject: [PATCH] sparc: Fix use of uid16_t and gid16_t in asm/stat.h
-sparc: Fix use of uid16_t and gid16_t in asm/stat.h
+commit 7469a9acf919d36836f6c635099d8edc9be4528a upstream.
Signed-off-by: Rob Landley <rob at landley.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
+ arch/sparc/include/asm/stat.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/include/asm/stat.h b/arch/sparc/include/asm/stat.h
index 39327d6..a232e9e 100644
@@ -25,4 +25,6 @@
unsigned short st_rdev;
off_t st_size;
time_t st_atime;
+--
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Provide-io-read-write-16-32-be.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Provide-io-read-write-16-32-be.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc-Provide-io-read-write-16-32-be.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,9 @@
-From 1bff4dbb79a2bc0ee4881c8ea6a4fbed64ea6309 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Wed, 3 Mar 2010 02:30:37 -0800
Subject: [PATCH] sparc: Provide io{read,write}{16,32}be().
+commit 1bff4dbb79a2bc0ee4881c8ea6a4fbed64ea6309 upstream.
+
Signed-off-by: David S. Miller <davem at davemloft.net>
---
arch/sparc/include/asm/io_32.h | 4 ++++
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,14 +1,17 @@
-From c0613ff21bef2595aebd8f33f36e52a7528e8cb0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Wed, 7 Apr 2010 03:22:51 +0100
+Date: Sun, 16 May 2010 02:28:49 +0100
Subject: [PATCH] PCI: Disable MSI for MCP55 on P5N32-E SLI
+commit e4146bb9088c01c8b6e82be11f0c371f8aff023c upstream.
+
As reported in <http://bugs.debian.org/552299>, MSI appears to be
broken for this on-board device. We already have a quirk for the
P5N32-SLI Premium; extend it to cover both variants of the board.
Reported-by: Romain DEGEZ <romain.degez at smartjog.com>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: stable at kernel.org
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---
drivers/pci/quirks.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
@@ -38,5 +41,5 @@
}
}
--
-1.7.0.3
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,8 +1,8 @@
-Subject: [PATCH 2/2] amd64-agp: Probe unknown AGP devices the right way
From: Ben Hutchings <ben at decadent.org.uk>
-To: David Airlie <airlied at linux.ie>
-Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>, Greg Kroah-Hartman <gregkh at suse.de>, LKML <linux-kernel at vger.kernel.org>
-Date: Wed, 24 Mar 2010 03:36:32 +0000
+Date: Wed, 24 Mar 2010 03:36:31 +0000
+Subject: [PATCH] amd64-agp: Probe unknown AGP devices the right way
+
+commit 6fd024893911dcb51b4a0aa71971db5ba38f7071 upstream.
The current initialisation code probes 'unsupported' AGP devices
simply by calling its own probe function. It does not lock these
@@ -14,15 +14,16 @@
switch the device id table and call driver_attach() again.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/char/agp/amd64-agp.c | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
-index fd50ead..93f56d6 100644
+index 73703b1..67ea3a6 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
-@@ -499,6 +499,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
+@@ -500,6 +500,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
u8 cap_ptr;
int err;
@@ -33,7 +34,7 @@
cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);
if (!cap_ptr)
return -ENODEV;
-@@ -562,6 +566,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
+@@ -563,6 +567,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
@@ -42,7 +43,7 @@
}
#ifdef CONFIG_PM
-@@ -709,6 +715,11 @@ static struct pci_device_id agp_amd64_pci_table[] = {
+@@ -710,6 +716,11 @@ static struct pci_device_id agp_amd64_pci_table[] = {
MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table);
@@ -54,7 +55,7 @@
static struct pci_driver agp_amd64_pci_driver = {
.name = "agpgart-amd64",
.id_table = agp_amd64_pci_table,
-@@ -734,7 +745,6 @@ int __init agp_amd64_init(void)
+@@ -735,7 +746,6 @@ int __init agp_amd64_init(void)
return err;
if (agp_bridges_found == 0) {
@@ -62,7 +63,7 @@
if (!agp_try_unsupported && !agp_try_unsupported_boot) {
printk(KERN_INFO PFX "No supported AGP bridge found.\n");
#ifdef MODULE
-@@ -750,17 +760,10 @@ int __init agp_amd64_init(void)
+@@ -751,17 +761,10 @@ int __init agp_amd64_init(void)
return -ENODEV;
/* Look for any AGP bridge */
@@ -85,5 +86,5 @@
return err;
}
--
-1.7.0
+1.7.1
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch Mon May 24 03:09:14 2010 (r15761)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch Mon May 24 03:34:28 2010 (r15762)
@@ -1,23 +1,24 @@
-Subject: [PATCH 1/2] sis-agp: Remove SIS 760, handled by amd64-agp
From: Ben Hutchings <ben at decadent.org.uk>
-To: David Airlie <airlied at linux.ie>
-Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>, LKML <linux-kernel at vger.kernel.org>
Date: Wed, 24 Mar 2010 03:33:48 +0000
+Subject: [PATCH] sis-agp: Remove SIS 760, handled by amd64-agp
+
+commit d831692a1a8e9ceaaa9bb16bb3fc503b7e372558 upstream.
SIS 760 is listed in the device tables for both amd64-agp and sis-agp.
amd64-agp is apparently preferable since it has workarounds for some
BIOS misconfigurations that sis-agp doesn't handle.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/char/agp/sis-agp.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
-index 6c3837a..95fdd4d 100644
+index b53d5f4..29aacd8 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
-@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
+@@ -416,14 +416,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
@@ -33,5 +34,5 @@
};
--
-1.7.0
+1.7.1
More information about the Kernel-svn-changes
mailing list