diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2018-12-03 21:16:07 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 19:26:16 +0200 |
| commit | 650a2e13b8e0789c595fa37e107c309d30095866 (patch) | |
| tree | a9734c39f0d19fda8b66fe6e9c5dd6e44a115d3e | |
| parent | 5228df5eb48fc2d316f5995c9deb8c54e80cda2f (diff) | |
mac80211: ignore NullFunc frames in the duplicate detection
commit 990d71846a0b7281bd933c34d734e6afc7408e7e 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
Change-Id: I524be05ea82cf34826ed826ac26e264968198a2c
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
[bwh: Backported to 3.16: The condition for "should we check for duplication"
is in ieee80211_rx_h_check() and is not inverted]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/mac80211/rx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f8c7f4600..e3e0cc0ec 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -939,6 +939,7 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) */ if (rx->skb->len >= 24 && rx->sta && !ieee80211_is_ctl(hdr->frame_control) && + !ieee80211_is_nullfunc(hdr->frame_control) && !ieee80211_is_qos_nullfunc(hdr->frame_control) && !is_multicast_ether_addr(hdr->addr1)) { if (unlikely(ieee80211_has_retry(hdr->frame_control) && |