diff options
| author | Javier Cardona <javier@cozybit.com> | 2012-10-25 11:10:18 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-25 21:54:41 +0200 |
| commit | f7fbf70ee9db6da6033ae50d100e017ac1f26555 (patch) | |
| tree | deb479e5b5f1de2d80dde4e24f9db87fa5ea186f /net | |
| parent | 2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c (diff) | |
| download | op-kernel-dev-f7fbf70ee9db6da6033ae50d100e017ac1f26555.zip op-kernel-dev-f7fbf70ee9db6da6033ae50d100e017ac1f26555.tar.gz | |
mac80211: don't inspect Sequence Control field on control frames
Per IEEE Std. 802.11-2012, Sec 8.2.4.4.1, the sequence Control field is
not present in control frames. We noticed this problem when processing
Block Ack Requests.
Cc: stable@vger.kernel.org
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Javier Lopez <jlopex@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f73e0dd..c6865f2 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1462,6 +1462,10 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) hdr = (struct ieee80211_hdr *)rx->skb->data; fc = hdr->frame_control; + + if (ieee80211_is_ctl(fc)) + return RX_CONTINUE; + sc = le16_to_cpu(hdr->seq_ctrl); frag = sc & IEEE80211_SCTL_FRAG; |
