Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660c6a44 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by John W. Linville
Browse files

mac80211: check if frame is really part of this BA 



There was an an implicit assumption that any QoS data frame received
from a STA/TID with an active BA session was sent to this vif as part of
a BA.  This is not true if IFF_PROMISC is enabled and the frame was
destined for a different peer, for example. Don't treat these frames as
part of a BA from the sending STA.

Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6cc00d54

net/mac80211/rx.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -744,6 +744,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx) 
	struct ieee80211_local *local = rx->local;

	struct ieee80211_local *local = rx->local;

	struct ieee80211_hw *hw = &local->hw;

	struct ieee80211_hw *hw = &local->hw;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct sta_info *sta = rx->sta;

	struct sta_info *sta = rx->sta;

	struct tid_ampdu_rx *tid_agg_rx;

	struct tid_ampdu_rx *tid_agg_rx;

	u16 sc;

	u16 sc;
@@ -777,6 +778,10 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx) 
	    ack_policy != IEEE80211_QOS_CTL_ACK_POLICY_NORMAL)

	    ack_policy != IEEE80211_QOS_CTL_ACK_POLICY_NORMAL)

		goto dont_reorder;

		goto dont_reorder;





	/* not actually part of this BA session */

	if (!(status->rx_flags & IEEE80211_RX_RA_MATCH))

		goto dont_reorder;



	/* new, potentially un-ordered, ampdu frame - process it */

	/* new, potentially un-ordered, ampdu frame - process it */





	/* reset session timer */

	/* reset session timer */