Skip to content

Commit 7b6d932

Browse files
egrumbachgregkh
authored andcommitted
mac80211: ignore NullFunc frames in the duplicate detection
commit 990d718 upstream. NullFunc packets should never be duplicate just like QoS-NullFunc packets. We saw a client that enters / exits power save with NullFunc frames (and not with QoS-NullFunc) despite the fact that the association supports HT. This specific client also re-uses a non-zero sequence number for different NullFunc frames. At some point, the client had to send a retransmission of the NullFunc frame and we dropped it, leading to a misalignment in the power save state. Fix this by never consider a NullFunc frame as duplicate, just like we do for QoS NullFunc frames. This fixes https://bugzilla.kernel.org/show_bug.cgi?id=201449 CC: <[email protected]> Signed-off-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bbc4242 commit 7b6d932

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/mac80211/rx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,7 @@ ieee80211_rx_h_check_dup(struct ieee80211_rx_data *rx)
12541254
return RX_CONTINUE;
12551255

12561256
if (ieee80211_is_ctl(hdr->frame_control) ||
1257+
ieee80211_is_nullfunc(hdr->frame_control) ||
12571258
ieee80211_is_qos_nullfunc(hdr->frame_control) ||
12581259
is_multicast_ether_addr(hdr->addr1))
12591260
return RX_CONTINUE;

0 commit comments

Comments
 (0)