diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-06-09 16:13:06 +0200 |
|---|---|---|
| committer | Lee Jones <joneslee@google.com> | 2021-08-19 11:22:04 +0100 |
| commit | 6c14f3f91383eb953689947b8d322d861da3a23a (patch) | |
| tree | c1b3921c1baf2a7a066f2aa2093a91ab9b7ccee6 | |
| parent | b9ba55e11388ce8abe111bfd42218bfc61289498 (diff) | |
| download | mediatek-6c14f3f91383eb953689947b8d322d861da3a23a.tar.gz | |
mac80211: drop multicast fragments
[ Upstream commit a9799541ca34652d9996e45f80e8e03144c12949 ]
These are not permitted by the spec, just drop them.
Link: https://lore.kernel.org/r/20210609161305.23def022b750.Ibd6dd3cdce573dae262fcdc47f8ac52b883a9c50@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ie215e5a40e6b15b34aecb68976242bcb16ea0d61
| -rw-r--r-- | net/mac80211/rx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 56fa8ca2ae8f..1a78d1a6b4e3 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1694,14 +1694,12 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) sc = le16_to_cpu(hdr->seq_ctrl); frag = sc & IEEE80211_SCTL_FRAG; - if (is_multicast_ether_addr(hdr->addr1)) { - rx->local->dot11MulticastReceivedFrameCount++; - goto out_no_led; - } - if (likely(!ieee80211_has_morefrags(fc) && frag == 0)) goto out; + if (is_multicast_ether_addr(hdr->addr1)) + return RX_DROP_MONITOR; + I802_DEBUG_INC(rx->local->rx_handlers_fragments); if (skb_linearize(rx->skb)) @@ -1798,7 +1796,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) out: ieee80211_led_rx(rx->local); - out_no_led: if (rx->sta) rx->sta->rx_packets++; return RX_CONTINUE; |