Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3988403pxj; Mon, 21 Jun 2021 10:53:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxilVZI3L6A9h/du2f7ibfK6SJnDvYFGf7oFLudaoQX12aDrFIOUz8xksHDhYtNNaV5JrFf X-Received: by 2002:a92:874b:: with SMTP id d11mr18469645ilm.137.1624298004806; Mon, 21 Jun 2021 10:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624298004; cv=none; d=google.com; s=arc-20160816; b=hEiIP/434akHRAa40LW82vMZ/9Ccx3TkAXS4GkFCd2dXj7ykQWQXQ9ApdezOComj2S M+0PnjT+EN+znTI/afU//D+VXNme2COFUeNu5TAXw44Cf4jO/quyjX3iEH1lHE8dWpzd xZqc5c+uNa70Sr9yc+VrgwXJz7VES3b6OW4CZYQAg7L1Axhlgv3topcdtMP6evAQpF/c GtbtMigJbFyUhbINN/JZbHzDIeQi7xoDCO7bixbJ6k+I4rsz1j8/PmzWJlFc5sTfOfDB EBS1ytUsGuAOTCieHRAcvvmJ0KtleTP7RCKPiG7cGCbmsos/ClvJj8jJSQNgqKx7FN4L 6Ukw== 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=egnTpgSITiJB5r7ouGbEOsLv6eO3BCN1HtCdzFBF0jo=; b=I7bNBODm/tQQOTxC1E9rMqLJo1e8XmTpjiYKRqiXo+D2fGoGDGUx0VaIEZTYCMaKC2 OLqEoOXS3+skYppl5SI85InhWoX+/7G+RXvyq+FsB98HhJYz0zrAeuJfl7OCginkvbPZ gA49w7R0xRERX2IzofOWQx8gj+Z37StZL4uy4UA3Le2xx3OrPsYWP+Hh5vrUtnW9HqId XSFkv3MiHcb9uVtJ+axH92Ytb5v4Q86ZYR6j5dA7F13Bmfp6RRuNwatyp/eCfPGQ9kvb nPmpe9aQCNamjx5XxlNkhQ/twCm6t41D0iVyi9JnQ/sPqTnSvU0rpbQpJCsSU06j6gQm 4WwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gPRyRiTT; 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 s10si19258259ioj.5.2021.06.21.10.53.11; Mon, 21 Jun 2021 10:53:24 -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=gPRyRiTT; 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 S232164AbhFURyz (ORCPT + 99 others); Mon, 21 Jun 2021 13:54:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:38788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231961AbhFURyf (ORCPT ); Mon, 21 Jun 2021 13:54:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A48F76128A; Mon, 21 Jun 2021 17:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624297941; bh=ZKOlOQEc0Zv2X+bJq4CpdNmLnkZxsej9vDF0pPBnW4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gPRyRiTTkkL/yKhTPhyj7vkwGpxs+x/mfNDWmofz9xDrxfTHasuPYtjtrHK5dPKNe l0Vv7Ysys/fachIQ3vRJoHL7Ep9tsJ3ua8MApJ6H38FsXUzUQW67pd46orUqbrfEc5 HvLqdQpTQbKr+JSlU7ezx+sN6rKNG7b0oXMBGItyqB4R3J+9Bcw0S7sLG1JKWUt3Jm 82LveauQHAvg0CHZ1w32TA+3zyWHfZOsiiejxWD3LEmdy+TlOoLZwpDiMqRKA//i5E VMTj2PCMm+92Iim8pRF0oe7pndurQ6yDXsa0hopzenc/38ir/CFmxh7RZ1esvUKWlM xC1PjfggtZfig== 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.12 14/39] mac80211: drop multicast fragments Date: Mon, 21 Jun 2021 13:51:30 -0400 Message-Id: <20210621175156.735062-14-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175156.735062-1-sashal@kernel.org> References: <20210621175156.735062-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 59de7a86599d..cb5cbf02dbac 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2239,17 +2239,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)) @@ -2375,7 +2373,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