Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3997116pxj; Mon, 21 Jun 2021 11:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxonzbZg0aH4TwLWLIjMSGobZy5Qn/cHsmxlEuEOOgby65wU8Z+8mLmD5/DAF07hS0X08kA X-Received: by 2002:a05:6e02:2197:: with SMTP id j23mr4383087ila.159.1624298673977; Mon, 21 Jun 2021 11:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624298673; cv=none; d=google.com; s=arc-20160816; b=YBziQ4hd5+bE4EpRYHYNbyMtT/cMPMid20He2bhnJjy29x05ft8T6+qNIus9APt7+m RCNkOm8Ylrj1JVhL7clc1Rjq61ameRQOt1lL+eOU15oXyfXzEkk28YVVGvi0Uk7ZYCqa pN9fZdTdxnvlR7NKfnXycAPpNdJ0ECKTcjEo83McLJiKZJT6OzFfG/5+v/eSmGsELE76 s06eEOBvSYDGG4NITbnSrXzmwmhQoDLVHQrfIOjrIGI0Niv6MO3aS5V/R5e8o0gPdqHi zF24nfJoyDIbF5/CUl9UmkYnwlqiIv6RbFfZuwWzUGAeK4A1/hAubJHTaBf3RmvegNFH dbhg== 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=iT5yNXl+2yF5Xmi8FHAC+A6k3YCG3kN+CG85QzX0pnk=; b=lVO8wtfgCj8ntVYNTl6soobGATbOytCwgBTfF6bKTHNGcQEPX/Tnug1hTGd9si38Ca 2sVqw9h7YjulHlIZjDr4Yla4unRX/4CCoqSgLnh8ku+O8GNFR0jdTMz3bSBdc7NwWDx2 jGZWmrVeFtH69+h3dg+hR4ua1DTzBHEZb7Eun5lhQyI6bbyfR0O97Q6ZFJYWFvS2C1zs 3bGPZDLeqmAeo8TOQAQpz4YpMH5mkkSy7k6fP7u4O5EWmBLLRB7d6FkX8kGywH5JzDA9 qnC1LQildubXuJotnoiyKPvI5g+6L1Jqq4BquMGhv+8h8u6uWsqPGvE+AM0VPa6MeCDR 4N5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I1SO7zyy; 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 d70si24437811iog.4.2021.06.21.11.04.21; Mon, 21 Jun 2021 11:04:33 -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=I1SO7zyy; 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 S233752AbhFUSG0 (ORCPT + 99 others); Mon, 21 Jun 2021 14:06:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:47286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232184AbhFUSEC (ORCPT ); Mon, 21 Jun 2021 14:04:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AB9D961419; Mon, 21 Jun 2021 17:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298149; bh=q4Ch5aLwhkpOI3OBAmrvkqhgZqn6fNoRPF7U7SBdh5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I1SO7zyy9Q5RI4NTOLMseStR4NZCzof6B0Tx0zitljMb5rPlcGYVVnl2Q6LXRBtN8 JL2PuC9dwp3Um3SI36qgNN0nITxHBKgpd6Rxt7JQHdP5xdKOy/Fd/0gzM6HIe4Ubil qE3uRydZbcCIJ0j6H25w3z7a2YbhxFSj0AGVp5YqXpZ3P6XbfW3G5/lRD/fxs/9kTv 1yJS0EBclFcRl/g3GsoK9If3b1iRNoBZo6epdCzgj3PpJ8oy+w2Ng0+Xs+mFENxYEt 21/0r+dVDvK+or7JYZc9ydcI5snHZABJoBASgeGztZvfFCrBh8xzqFIgaB2ETNw6w1 Jvkq/R+b05/kQ== 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.9 03/13] mac80211: drop multicast fragments Date: Mon, 21 Jun 2021 13:55:33 -0400 Message-Id: <20210621175544.736421-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175544.736421-1-sashal@kernel.org> References: <20210621175544.736421-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 721caa5a5430..3a069cb188b7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1988,17 +1988,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)) @@ -2127,7 +2125,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