This is a note to let you know that I've just added the patch titled
mac80211: fix duplicate retransmission detection
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-fix-duplicate-retransmission-detection.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 6b0f32745dcfba01d7be33acd1b40306c7a914c6 Mon Sep 17 00:00:00 2001
From: Johannes Berg <[email protected]>
Date: Thu, 11 Jul 2013 22:33:26 +0200
Subject: mac80211: fix duplicate retransmission detection
From: Johannes Berg <[email protected]>
commit 6b0f32745dcfba01d7be33acd1b40306c7a914c6 upstream.
The duplicate retransmission detection code in mac80211
erroneously attempts to do the check for every frame,
even frames that don't have a sequence control field or
that don't use it (QoS-Null frames.)
This is problematic because it causes the code to access
data beyond the end of the SKB and depending on the data
there will drop packets erroneously.
Correct the code to not do duplicate detection for such
frames.
I found this error while testing AP powersave, it lead
to retransmitted PS-Poll frames being dropped entirely
as the data beyond the end of the SKB was always zero.
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/mac80211/rx.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -932,8 +932,14 @@ ieee80211_rx_h_check(struct ieee80211_rx
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
- /* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */
- if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) {
+ /*
+ * Drop duplicate 802.11 retransmissions
+ * (IEEE 802.11-2012: 9.3.2.10 "Duplicate detection and recovery")
+ */
+ if (rx->skb->len >= 24 && rx->sta &&
+ !ieee80211_is_ctl(hdr->frame_control) &&
+ !ieee80211_is_qos_nullfunc(hdr->frame_control) &&
+ !is_multicast_ether_addr(hdr->addr1)) {
if (unlikely(ieee80211_has_retry(hdr->frame_control) &&
rx->sta->last_seq_ctrl[rx->seqno_idx] ==
hdr->seq_ctrl)) {
Patches currently in stable-queue which might be from [email protected]
are
queue-3.10/mac80211-minstrel-fix-null-pointer-dereference-issue.patch
queue-3.10/mac80211-fix-duplicate-retransmission-detection.patch
queue-3.10/iwlwifi-mvm-refuse-connection-to-aps-with-bi-16.patch
queue-3.10/mac80211-fix-monitor-interface-suspend-crash-regression.patch
queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
queue-3.10/nl80211-fix-mgmt-tx-status-and-testmode-reporting-for-netns.patch
queue-3.10/iwlwifi-mvm-fix-bug-in-scan-ssid.patch
queue-3.10/iwlwifi-mvm-fix-flushing-not-started-aggregation-sessions.patch
queue-3.10/iwlwifi-add-dell-sku-for-5150-hmc.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
