From 1dfe4b1e09a65d0aaf96ab665220131377d586a7 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 3 Dec 2009 08:12:24 +0000 Subject: [PATCH] debian/patches: Fix patches, remove merged patches. svn path=/dists/trunk/linux-2.6/; revision=14717 --- ...mac80211-fix-spurious-delBA-handling.patch | 177 ------------------ .../mac80211-fix-two-remote-exploits.patch | 60 ------ .../bugfix/arm/videobuf-dma-build-fix.patch | 58 ------ .../bugfix/mips/ip22-no-early-printk.patch | 22 --- .../scripts-kconfig-reportoldconfig.patch | 2 +- debian/patches/features/arm/ts41x.patch | 7 - debian/patches/series/base | 4 - 7 files changed, 1 insertion(+), 329 deletions(-) delete mode 100644 debian/patches/bugfix/all/mac80211-fix-spurious-delBA-handling.patch delete mode 100644 debian/patches/bugfix/all/mac80211-fix-two-remote-exploits.patch delete mode 100644 debian/patches/bugfix/arm/videobuf-dma-build-fix.patch delete mode 100644 debian/patches/bugfix/mips/ip22-no-early-printk.patch diff --git a/debian/patches/bugfix/all/mac80211-fix-spurious-delBA-handling.patch b/debian/patches/bugfix/all/mac80211-fix-spurious-delBA-handling.patch deleted file mode 100644 index b29419f6d..000000000 --- a/debian/patches/bugfix/all/mac80211-fix-spurious-delBA-handling.patch +++ /dev/null @@ -1,177 +0,0 @@ -commit 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 -Author: Johannes Berg -Date: Sun Nov 22 12:28:41 2009 +0100 - - mac80211: fix spurious delBA handling - - Lennert Buytenhek noticed that delBA handling in mac80211 - was broken and has remotely triggerable problems, some of - which are due to some code shuffling I did that ended up - changing the order in which things were done -- this was - - commit d75636ef9c1af224f1097941879d5a8db7cd04e5 - Author: Johannes Berg - Date: Tue Feb 10 21:25:53 2009 +0100 - - mac80211: RX aggregation: clean up stop session - - and other parts were already present in the original - - commit d92684e66091c0f0101819619b315b4bb8b5bcc5 - Author: Ron Rindjunsky - Date: Mon Jan 28 14:07:22 2008 +0200 - - mac80211: A-MPDU Tx add delBA from recipient support - - The first problem is that I moved a BUG_ON before various - checks -- thereby making it possible to hit. As the comment - indicates, the BUG_ON can be removed since the ampdu_action - callback must already exist when the state is != IDLE. - - The second problem isn't easily exploitable but there's a - race condition due to unconditionally setting the state to - OPERATIONAL when a delBA frame is received, even when no - aggregation session was ever initiated. All the drivers - accept stopping the session even then, but that opens a - race window where crashes could happen before the driver - accepts it. Right now, a WARN_ON may happen with non-HT - drivers, while the race opens only for HT drivers. - - For this case, there are two things necessary to fix it: - 1) don't process spurious delBA frames, and be more careful - about the session state; don't drop the lock - - 2) HT drivers need to be prepared to handle a session stop - even before the session was really started -- this is - true for all drivers (that support aggregation) but - iwlwifi which can be fixed easily. The other HT drivers - (ath9k and ar9170) are behaving properly already. - - Reported-by: Lennert Buytenhek - Cc: stable@kernel.org - Signed-off-by: Johannes Berg - Signed-off-by: John W. Linville - -diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c -index fb9bcfa..b7e196e 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-tx.c -+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c -@@ -1277,8 +1277,16 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) - return -ENXIO; - } - -+ if (priv->stations[sta_id].tid[tid].agg.state == -+ IWL_EMPTYING_HW_QUEUE_ADDBA) { -+ IWL_DEBUG_HT(priv, "AGG stop before setup done\n"); -+ ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid); -+ priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF; -+ return 0; -+ } -+ - if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON) -- IWL_WARN(priv, "Stopping AGG while state not IWL_AGG_ON\n"); -+ IWL_WARN(priv, "Stopping AGG while state not ON or starting\n"); - - tid_data = &priv->stations[sta_id].tid[tid]; - ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4; -diff --git a/include/net/mac80211.h b/include/net/mac80211.h -index c75b960..998c30f 100644 ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -1283,6 +1283,12 @@ enum ieee80211_filter_flags { - * - * These flags are used with the ampdu_action() callback in - * &struct ieee80211_ops to indicate which action is needed. -+ * -+ * Note that drivers MUST be able to deal with a TX aggregation -+ * session being stopped even before they OK'ed starting it by -+ * calling ieee80211_start_tx_ba_cb(_irqsafe), because the peer -+ * might receive the addBA frame and send a delBA right away! -+ * - * @IEEE80211_AMPDU_RX_START: start Rx aggregation - * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation - * @IEEE80211_AMPDU_TX_START: start Tx aggregation -diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c -index 63224d1..89e238b 100644 ---- a/net/mac80211/agg-tx.c -+++ b/net/mac80211/agg-tx.c -@@ -123,13 +123,18 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 - ieee80211_tx_skb(sdata, skb, 0); - } - --static int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, -- enum ieee80211_back_parties initiator) -+int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, -+ enum ieee80211_back_parties initiator) - { - struct ieee80211_local *local = sta->local; - int ret; - u8 *state; - -+#ifdef CONFIG_MAC80211_HT_DEBUG -+ printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n", -+ sta->sta.addr, tid); -+#endif /* CONFIG_MAC80211_HT_DEBUG */ -+ - state = &sta->ampdu_mlme.tid_state_tx[tid]; - - if (*state == HT_AGG_STATE_OPERATIONAL) -@@ -143,7 +148,6 @@ static int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, - - /* HW shall not deny going back to legacy */ - if (WARN_ON(ret)) { -- *state = HT_AGG_STATE_OPERATIONAL; - /* - * We may have pending packets get stuck in this case... - * Not bothering with a workaround for now. -@@ -525,11 +529,6 @@ int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, - goto unlock; - } - --#ifdef CONFIG_MAC80211_HT_DEBUG -- printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n", -- sta->sta.addr, tid); --#endif /* CONFIG_MAC80211_HT_DEBUG */ -- - ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator); - - unlock: -diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c -index 48ef1a2..cdc58e6 100644 ---- a/net/mac80211/ht.c -+++ b/net/mac80211/ht.c -@@ -141,7 +141,6 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, - struct sta_info *sta, - struct ieee80211_mgmt *mgmt, size_t len) - { -- struct ieee80211_local *local = sdata->local; - u16 tid, params; - u16 initiator; - -@@ -161,10 +160,9 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, - WLAN_BACK_INITIATOR, 0); - else { /* WLAN_BACK_RECIPIENT */ - spin_lock_bh(&sta->lock); -- sta->ampdu_mlme.tid_state_tx[tid] = -- HT_AGG_STATE_OPERATIONAL; -+ if (sta->ampdu_mlme.tid_state_tx[tid] & HT_ADDBA_REQUESTED_MSK) -+ ___ieee80211_stop_tx_ba_session(sta, tid, -+ WLAN_BACK_RECIPIENT); - spin_unlock_bh(&sta->lock); -- ieee80211_stop_tx_ba_session(&local->hw, sta->sta.addr, tid, -- WLAN_BACK_RECIPIENT); - } - } -diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h -index a910bf1..10d316e 100644 ---- a/net/mac80211/ieee80211_i.h -+++ b/net/mac80211/ieee80211_i.h -@@ -1091,6 +1091,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, - - int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, - enum ieee80211_back_parties initiator); -+int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, -+ enum ieee80211_back_parties initiator); - - /* Spectrum management */ - void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, diff --git a/debian/patches/bugfix/all/mac80211-fix-two-remote-exploits.patch b/debian/patches/bugfix/all/mac80211-fix-two-remote-exploits.patch deleted file mode 100644 index 1ae5c0305..000000000 --- a/debian/patches/bugfix/all/mac80211-fix-two-remote-exploits.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 4253119acf412fd686ef4bd8749b5a4d70ea3a51 -Author: Johannes Berg -Date: Fri Nov 20 09:15:51 2009 +0100 - - mac80211: fix two remote exploits - - Lennert Buytenhek noticed a remotely triggerable problem - in mac80211, which is due to some code shuffling I did - that ended up changing the order in which things were - done -- this was in - - commit d75636ef9c1af224f1097941879d5a8db7cd04e5 - Author: Johannes Berg - Date: Tue Feb 10 21:25:53 2009 +0100 - - mac80211: RX aggregation: clean up stop session - - The problem is that the BUG_ON moved before the various - checks, and as such can be triggered. - - As the comment indicates, the BUG_ON can be removed since - the ampdu_action callback must already exist when the - state is OPERATIONAL. - - A similar code path leads to a WARN_ON in - ieee80211_stop_tx_ba_session, which can also be removed. - - Cc: stable@kernel.org [2.6.29+] - Cc: Lennert Buytenhek - Signed-off-by: Johannes Berg - Signed-off-by: John W. Linville - -diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c -index bc064d7..ce8e0e7 100644 ---- a/net/mac80211/agg-rx.c -+++ b/net/mac80211/agg-rx.c -@@ -85,10 +85,6 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r - struct ieee80211_local *local = sdata->local; - struct sta_info *sta; - -- /* stop HW Rx aggregation. ampdu_action existence -- * already verified in session init so we add the BUG_ON */ -- BUG_ON(!local->ops->ampdu_action); -- - rcu_read_lock(); - - sta = sta_info_get(local, ra); -diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c -index 206fd82..63224d1 100644 ---- a/net/mac80211/agg-tx.c -+++ b/net/mac80211/agg-tx.c -@@ -545,7 +545,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw, - struct sta_info *sta; - int ret = 0; - -- if (WARN_ON(!local->ops->ampdu_action)) -+ if (!local->ops->ampdu_action) - return -EINVAL; - - if (tid >= STA_TID_NUM) diff --git a/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch b/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch deleted file mode 100644 index f72bf3d47..000000000 --- a/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -# HG changeset patch -# User Guennadi Liakhovetski -# Date 1257793894 -3600 -# Node ID d5defdb8768d9e1e951b0190b401d6b69a8b1787 -# Parent 19c0469c02c3b564af14a3d2228aff51de42ccaa -v4l: add more missing linux/sched.h includes -From: Guennadi Liakhovetski - -Signed-off-by: Guennadi Liakhovetski -Priority: high ---- - drivers/media/video/mx1_camera.c | 1 + - drivers/media/video/mx3_camera.c | 1 + - drivers/media/video/sh_mobile_ceu_camera.c | 1 + - drivers/media/video/videobuf-dma-contig.c | 1 + - 4 files changed, 4 insertions(+), 0 deletions(-) - ---- linux/drivers/media/video/mx1_camera.c Sat Nov 07 15:51:01 2009 -0200 -+++ linux/drivers/media/video/mx1_camera.c Mon Nov 09 20:11:34 2009 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- linux/drivers/media/video/mx3_camera.c Sat Nov 07 15:51:01 2009 -0200 -+++ linux/drivers/media/video/mx3_camera.c Mon Nov 09 20:11:34 2009 +0100 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include - #include ---- linux/drivers/media/video/sh_mobile_ceu_camera.c Sat Nov 07 15:51:01 2009 -0200 -+++ linux/drivers/media/video/sh_mobile_ceu_camera.c Mon Nov 09 20:11:34 2009 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include ---- a/drivers/media/video/videobuf-dma-contig.c 2009-10-31 10:22:42.000000000 +0000 -+++ b/drivers/media/video/videobuf-dma-contig.c 2009-10-31 10:24:40.000000000 +0000 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - - struct videobuf_dma_contig_memory { - diff --git a/debian/patches/bugfix/mips/ip22-no-early-printk.patch b/debian/patches/bugfix/mips/ip22-no-early-printk.patch deleted file mode 100644 index 801a99ed4..000000000 --- a/debian/patches/bugfix/mips/ip22-no-early-printk.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: Turn off EARLY_PRINTK on IP22 to make the system boot - -Thomas Bogendoerfer: current kernels are not working on that machine -due to some bad interaction between CONFIG_EARLY_PRINTK and -overwritten prom memory during early boot (this bug is on my -todo list. - -In the meantime, turn off CONFIG_EARLY_PRINTK on IP22. - -Debian bug #507557 - ---- a/arch/mips/Kconfig 2009-09-22 09:22:46.000000000 +0000 -+++ b/arch/mips/Kconfig 2009-09-22 09:22:59.000000000 +0000 -@@ -357,7 +357,6 @@ - select SWAP_IO_SPACE - select SYS_HAS_CPU_R4X00 - select SYS_HAS_CPU_R5000 -- select SYS_HAS_EARLY_PRINTK - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_64BIT_KERNEL - select SYS_SUPPORTS_BIG_ENDIAN - diff --git a/debian/patches/debian/scripts-kconfig-reportoldconfig.patch b/debian/patches/debian/scripts-kconfig-reportoldconfig.patch index 55ca2b261..6f823cd91 100644 --- a/debian/patches/debian/scripts-kconfig-reportoldconfig.patch +++ b/debian/patches/debian/scripts-kconfig-reportoldconfig.patch @@ -25,7 +25,7 @@ index fa8c2dd..7936c57 100644 + $< -U $(Kconfig) + localmodconfig: $(obj)/streamline_config.pl $(obj)/conf - $(Q)perl $< $(Kconfig) > .tmp.config + $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)if [ -f .config ]; then \ diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 3e1057f..e526d00 100644 diff --git a/debian/patches/features/arm/ts41x.patch b/debian/patches/features/arm/ts41x.patch index 241c0bba7..f621b713c 100644 --- a/debian/patches/features/arm/ts41x.patch +++ b/debian/patches/features/arm/ts41x.patch @@ -285,10 +285,3 @@ index 80ab0ec..0c79ced 100644 + .init_irq = kirkwood_init_irq, + .timer = &kirkwood_timer, +MACHINE_END ---- a/arch/arm/tools/mach-types -+++ b/arch/arm/tools/mach-types -@@ -2421,3 +2421,4 @@ - mh355 MACH_MH355 MH355 2435 - pc7802 MACH_PC7802 PC7802 2436 - gnet_sgc MACH_GNET_SGC GNET_SGC 2437 -+ts41x MACH_TS41X TS41X 2502 diff --git a/debian/patches/series/base b/debian/patches/series/base index d3fd1be2c..dbe743391 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -34,7 +34,6 @@ + bugfix/sparc/drivers_net-broken.patch #+ bugfix/ia64/hardcode-arch-script-output.patch + bugfix/mips/disable-advansys.patch -+ bugfix/mips/ip22-no-early-printk.patch + bugfix/arm/disable-scsi_acard.patch + bugfix/mips/disable-werror.patch + bugfix/fix-hifn_795X-divdi3.patch @@ -48,11 +47,8 @@ + features/arm/compression-add-lzmo.patch + features/arm/openrd-client.patch + features/arm/ts41x.patch -+ bugfix/arm/videobuf-dma-build-fix.patch + bugfix/arm/scsi-osd-build-fix.patch + bugfix/mips/drm-ttm-build-fix.patch + bugfix/all/DocBook-media-copy-images-after-building-HTML.patch + bugfix/all/DocBook-media-create-links-for-included-sources.patch + features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch -+ bugfix/all/mac80211-fix-two-remote-exploits.patch -+ bugfix/all/mac80211-fix-spurious-delBA-handling.patch