Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4001024pxj; Mon, 21 Jun 2021 11:09:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyz3eQpPH+15YmqpZKbjduCiNGIx+t2osDkvcPGChLEUrblhSWO42ia+8D3iBalZoHAD/s+ X-Received: by 2002:a5d:9484:: with SMTP id v4mr21564699ioj.147.1624298962876; Mon, 21 Jun 2021 11:09:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624298962; cv=none; d=google.com; s=arc-20160816; b=tuP46UJ4sE+6TFi035QT+cl7hU/Xo4xGjE3y655FdPT+90QV2suKfI4lLMwmd+qvVK NsRn0Vl7mOsHly2mei9O5ssRQbanxrEs1QIrpBYkzKtuP2zotBz8LMqe0LP1aIDAroAD d7KWpx10Q5whjFq1dkR/Z6CE9XJ06UjYVqPFqB2GctRKCX2ZGvExIf7/0i51MqFM4WmQ 5ppVpIO3B+I/ggOxihjIWokfN0adBg99tOyw96/r1tNcALjcc4msNq+qXCQHiLsQ++oq R20go48JlvutNL8ze8XDUTgjB4UwIj5JNvgY7RIo1TOjRD5WmMZipHREXi0IsMdOStUW 6XQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zwZatQq1m3GkMGBhzqwFKWIa5NMAraFa7HAhcpXFI/U=; b=B61ThEKiaS6FeHnG9OfqAnZNq6cR0ISwTcwuqNDA2Vuwzhu35gz9fOLvoaQVs+39s0 KTj6WVU4N80GEH+2m9pTnhPThHmbdF/HVTXlIlSVFGiMS8GS1Ni2/1bXw/EvESUWS6Ln pLkSaNOx53PcXRdzk29lE3G+VyVfo/yapNa7EDI6RqM1qMDpkiKMDcHfu+0apXc5g0Ug PeCOlDxy+BKBSDdBVCZSdLaGqmMWmc/QFXzN98Z4Ds6uuDqxqGpLQ4IlaMgCqcegPsba BSJil5QuKSNHkm/h4WNgvNRk5OF4uI2N3I14JMMektQVrLsIj4vHoNe5cyvE8LC0XMU7 Q0kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fl22s5WK; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t17si19637451jaj.108.2021.06.21.11.09.10; Mon, 21 Jun 2021 11:09:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fl22s5WK; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233465AbhFUSJB (ORCPT + 99 others); Mon, 21 Jun 2021 14:09:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234286AbhFUSFD (ORCPT ); Mon, 21 Jun 2021 14:05:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 013D26135D; Mon, 21 Jun 2021 17:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298171; bh=bptRCqEJ8bWyjVb1m8aqTTm0rNWtT6SP2b/8nDtdCHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fl22s5WKlG6wKTqbAcp3wgZbhXPFdDN2s/WUsEyeMncRbnucVw9fCHq6rohdoh7hx TnsUaslALgdQ1DIdd5No8CLGzqyd7qNKGHRz5dUzgbyMqeDUnA3crvPcFNHgPVa6/o Dr8JP5ZUvh7kWaApMmsVd4sAYeEt7tvXetH2wk5ZO90H9sOs/ouGFxoXxOSOExBVoH OaUu7WD9Hf3hEB6khIGBJh/GGLzFkltuV0kiSt1A7QS8ocW/JIk14NLX/CJtjTabee QvKO6VEDd62Qc1w7QJ87x8xPT22i0E+nczCDHHk/xrRBnmpCwaAI4VXSSGUsiqAKrX kSO0C1JKw9XRg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 2/9] mac80211: drop multicast fragments Date: Mon, 21 Jun 2021 13:56:00 -0400 Message-Id: <20210621175608.736581-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175608.736581-1-sashal@kernel.org> References: <20210621175608.736581-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg [ 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 Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index ae0fba044cd0..bde924968cd2 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1853,17 +1853,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)) @@ -1992,7 +1990,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; -- 2.30.2