From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54FAC3955C0; Tue, 12 May 2026 17:54:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608448; cv=none; b=AaI7xyZ4pdg6ej+JoHScylwvXOynx4iUi1GLZb97om4SjVnFKmWlhITMOHNDwSB/W+C0QHcmp2sbsWvp/4R/Tv+uX7QySBN5M9zcawx+6Yhe+XtdQizJFFXdNTCHsas90sqtEqRVPgIxjHCJa+Rjh9a0iJ2uyf9Mr/44VHmxhvs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608448; c=relaxed/simple; bh=Hj/U133CqyozzSxc311KZiAescIJr1sBTbMm5+HEwDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D3E2T32dq3qxdl7OI76O/7wRGV13+T/+RWx7u11zq/RlLre/HjE29MIV7XuccHRXcoLnqAJnSZHvxSUQdW5kGfdXiIw/xQbGZoi3oOVmKIZNKXkIQRPzYRfXvffdOzF/gIjRbI/V3o6MtR2EVT1el85IsxUBYiovaURA0QgCaco= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=plFSMqsS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="plFSMqsS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF51BC2BCB0; Tue, 12 May 2026 17:54:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608448; bh=Hj/U133CqyozzSxc311KZiAescIJr1sBTbMm5+HEwDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=plFSMqsS26H+AJzpGD5XOBIPYAfx4ggujiF/0qWZmmuXtD/5pVY8E/ZDqHgk/Zebi TcJZ7aFXUXyUN7JqBYa+9ftvL+t1DrDv/ld+ox7AHmPfTTEDKnXJ6QJyg4d04YTC+I OGAqa0WjS14how7FN6zNHbucDV8JPchpqc+NOycM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Catherine , Johannes Berg Subject: [PATCH 6.18 031/270] wifi: mac80211: drop stray static from fast-RX rx_result Date: Tue, 12 May 2026 19:37:12 +0200 Message-ID: <20260512173939.112163851@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Catherine commit 7a5b81e0c87a075afd572f659d8eb68c9c4cd2ba upstream. ieee80211_invoke_fast_rx() is documented as safe for parallel RX, but its per-invocation rx_result is declared static. Concurrent callers then share one instance and can overwrite each other's result between ieee80211_rx_mesh_data() and the switch on res. That can make a packet that was queued or consumed by ieee80211_rx_mesh_data() fall through into ieee80211_rx_8023(), or make a packet that should continue return as queued. Make res an automatic variable so each invocation keeps its own result. Fixes: 3468e1e0c639 ("wifi: mac80211: add mesh fast-rx support") Cc: stable@vger.kernel.org Signed-off-by: Catherine Link: https://patch.msgid.link/20260424131435.83212-2-enderaoelyther@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -4824,7 +4824,7 @@ static bool ieee80211_invoke_fast_rx(str struct sk_buff *skb = rx->skb; struct ieee80211_hdr *hdr = (void *)skb->data; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - static ieee80211_rx_result res; + ieee80211_rx_result res; int orig_len = skb->len; int hdrlen = ieee80211_hdrlen(hdr->frame_control); int snap_offs = hdrlen;