Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3996968pxj; Mon, 21 Jun 2021 11:04:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgKrG4R/1oneo8lkJI9P/eqH4wRON8LPkX/S4F9r14VuFTCCeHmZq0eID79sI7US3NqOlf X-Received: by 2002:a92:3610:: with SMTP id d16mr18211337ila.16.1624298664589; Mon, 21 Jun 2021 11:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624298664; cv=none; d=google.com; s=arc-20160816; b=DrsY2ccS5juzUB+aQAvmdd23mXauX6SGcLkP/p6PmTyI5CurfBV28fyvGCHxpO3+H/ E4MibEra6GQyMXkju+OshzSzpf+cL+MXkYWeRmA5kN2sDMRbWqLJWmXVDEFvuiE//dxH +JZa0NJuuQlEGhWDN2lgHDc28GLFw3lOsLLnqvULrySD6PSELKZH3Y92PidEIPy6W3wb 5qJPgX0jkE/ayCj59ketK0t3nOIAhXNKywQVqsMqlCaWgSasM/rxr8dJeD133nyXxHQz VtNV4WwWMwp1ogLAGqFAFnYU5bQLrAGvcv7qpghbTBU7sxEchno1oOZ5iPIrtarkT87h xFWA== 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=uIN+KY+sMsECd87b2eQSL7F6FictkFA/VvNzBzaNNxk=; b=LA0ky+9NY/8DLuSbd37jZ1541zguyRVABKLrhCGQw8Kqypwb/VJASgHxdcSqM54Qlq gVaXuQ+Q9n+/BosPugGFLFi1jp+HSHk+2yhmrowGcMt2t6uOzOYS7bsRlNeStFAv3uBp DY8QRnPAxMU1pdscIP9527bGoQF5XY1uv1823ZyOfQnitgfZRN5v+SdADfTpy9OvBY6B jY/jzgPCS1rEOH6Ntd0CQFBuVfptOVfYTVdGpmEetTUxevHukP8DzhtcKWQrveQR3ZJz AhmX+vQye18p68tUMLmnXfEU55MIkHFU1xcSB3Yg+r4cBlFXiag52WeL2dldCOxnR3pS Kn3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GO5IiCeC; 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 j12si19669308jar.85.2021.06.21.11.04.12; Mon, 21 Jun 2021 11:04: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=GO5IiCeC; 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 S233680AbhFUSGQ (ORCPT + 99 others); Mon, 21 Jun 2021 14:06:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:46172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233326AbhFUSCy (ORCPT ); Mon, 21 Jun 2021 14:02:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D77561206; Mon, 21 Jun 2021 17:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298124; bh=syClMTPN6fkpyBoEA0OAmpus6RlWaMNyrOQARjvAiIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GO5IiCeCD/TpIs13XK7kUQHAMicqtv4mz4YbiClwOSbrYn9TcPL4Xuw+ukXzVLcMB iZ6GTVeP1cn2739BCT0jhH1zhZRrnAA7w+wFk3dx3eQ46q7uW4c/9y65tY9yHk8PN3 Hgkz3dDcNskhsNA7+M5hc+3DEHMHUUIyizR1YbDqiTopdr1/Nhyp/xknbK4ceB7UbN 515A1/aS3D2Ek5GuC0o5CAya1jOx7BEYnjqr5F/2UaoOP/SFsqNnRiGM9AbpfmwMoq 8XX3jGzna3NVzV8muq7kF+gTsxDk+89Yvvrv3RBMrGEtNi7qo+ai16x3OGBJCRxGP2 3Gw7u5GH+KQJQ== 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.14 03/13] mac80211: drop multicast fragments Date: Mon, 21 Jun 2021 13:55:09 -0400 Message-Id: <20210621175519.736255-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175519.736255-1-sashal@kernel.org> References: <20210621175519.736255-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 6b4fd56800f7..ac2c52709e1c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2014,17 +2014,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)) @@ -2150,7 +2148,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