Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3990477pxj; Mon, 21 Jun 2021 10:56:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQcEcsKBX587kzRuoze5EZFxnn96bZWU6yvNRI91EitRUTIQY8BfeooVRX2SiVjXc6x1Gj X-Received: by 2002:a02:600b:: with SMTP id i11mr19201573jac.86.1624298178152; Mon, 21 Jun 2021 10:56:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624298178; cv=none; d=google.com; s=arc-20160816; b=xPVDZ+84qUSTQ55FaNRH0V3govb72AM3jeOW7RvRcbyWqUtbUHk8Q65F356I61aNBL 9htLGGyAxVF12SPZhVtrZLoN89eut22N1p15Hk+aiX++VdQP6XSYJLqht88gk3bw0UJE cDgwOAk+g+QfS0ic8lwxD02CRnM/T6RV/ONkVaUq7+6MNlI/iSFZTnRCmwlL+SeRpKPK 5F48ux/xSPToKMFaGUjTAzHzELExU6xQnOFCOtpLYzk7/zQ79Tp8YuIZwCY02IYtIIyT p2yy0xu+F6sxHLtQSZx9q29mu6TXEw48GlBpgtDdDMYQLvzRwqIJmPZgd/6D9oQp5bf3 YxVg== 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=F+dcge/ItdtFni+MGy55p/HrRQ1z7WVH1sbVzj0qf+c=; b=ZTERR8ZjjvI7ATcjIla+5x8cM8XdNDDbo91RzYzfaQjyf7eD3iJinEd4N9egLiWrc4 Sgy4PW33g7CviJcQarBw9chxn55bJCAWYbcVHDOWpyGJpI0asqCDyk9JgTM6YAdHrQdq 8RJ2Sn7/r4QMLyXaC0hmbqaQVE+lmzwctdpzeXYV+nYN1rM1e3JHM8pQk2hvUeDgwe9E whG7IMBNGOcBGonuAfQQsAXZFmyBhnvQkeoh90VQLwgSku3x/KMYiZpDk5+Mw6hzNxKK 3u2ujWia/P0lEPVz8aNhI3/2OI8yV3fwaM07h8PRz79PprLCjm+AJxS51Ft5Nn4ERsRc NsxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YXHcY8lH; 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 h8si19675926jav.2.2021.06.21.10.56.06; Mon, 21 Jun 2021 10:56:18 -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=YXHcY8lH; 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 S232907AbhFUR6N (ORCPT + 99 others); Mon, 21 Jun 2021 13:58:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:39622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232893AbhFUR4M (ORCPT ); Mon, 21 Jun 2021 13:56:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55D3A61245; Mon, 21 Jun 2021 17:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298000; bh=KhbiyuLLERIEN3mwW3CiOReyCEtnWfy9EMZ7F+JCMOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXHcY8lHtLRzc+uqeIZyVj/hssOdzxsFVUazomRWwouyJHbKmb42DE6y1T6ciLk8J kYo6b5N41hxwyD4aeeoLBzieCorAVHePVZgv1yBwvsbO7w3+nn/qx6qgnaTuLi++Cw cT9DAoj4lscCnmpT/ngtXIynYb/mP1jclKTpxqvNWEvL/Lr318TKEWeoRiBnWHZnPM l0VSR8sCilG/z0xmazJp/0SQ/XXEx9saqbYMjixhvYThpOY031891hfBMwzTZ8xKKK zHWWIdtyxPEHFOMe6tJ0M9PrW1+mhvaEpndyyyzSSR4jfeTvgFx6F3MPFWTW0q4fnj gKnPMKGKdQE7w== 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 5.10 13/35] mac80211: drop multicast fragments Date: Mon, 21 Jun 2021 13:52:38 -0400 Message-Id: <20210621175300.735437-13-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175300.735437-1-sashal@kernel.org> References: <20210621175300.735437-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 ef8ff0bc66f1..38b5695c2a0c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2250,17 +2250,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)) @@ -2386,7 +2384,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