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

Commit 62aed2df authored by Johannes Berg's avatar Johannes Berg Committed by Sasha Levin
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eb2b1216

net/mac80211/rx.c

+3 −6
Original line number Diff line number Diff line
@@ -2200,17 +2200,15 @@ 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)) {

		I802_DEBUG_INC(rx->local->dot11MulticastReceivedFrameCount);

		goto out_no_led;

	}



	if (rx->sta)

		cache = &rx->sta->frags;



	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))
@@ -2336,7 +2334,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_stats.packets++;

	return RX_CONTINUE;