From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030211; b=27uacZOrWISRbZYgp729TszQpvj9GiubuSkyACtLkMyRiTe0rRcQ8fvDyrd4AqJIh4mg cLJTIYWV3EtB4U2mDhwgUiuLoinD8B6q9iQ/ej7iFCwCRmS7BT3CzqsRj0QRbzBEosyQw gOppEfyCJ3JnG2NbEaEpON8b4e4Ozs+1sD+ntUgitgf3OYoizo1VOhU0wLkFAP4Zuowvx CdHeXMKDr9IjINqUmga4wzIQL0Hv+0WWSS6/glcsB5hxgZOhDFYtCp48lAEblpah9MDG7 uRjBJcye2a1LhxjM/dLChOxonbCo9AgyRgdZi0D0moYL2RwGwZLC3fTHJhn22ABBm1g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030211; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=sQ1a2CEX74I0TuF4wQF07gROwJ89GQ8ND9ZuRX8VOt0=; b=LFoWwlGUIjlJHM4TFMbJD8aduj/STIBDsC8DqDJNt/zpkEwfTys709rUoMV34/LhGzkS v1aPVtLB1Unvc1/gwoOPh3aNr1OVifTBYGIVn2eqP2kajbg1KpzVdPEDlitdrVshablag ZemN2uyVOM9dR0kGV1NPl/SN8xHAMUFLYFplgcIZNNZZICpiWDV8vodhnpcJ/lInSQ13M loN2LBjtmRLkjZ91Q8APc7E1riREZvVmf5cq09z9DWta2Y8WNSWVD0w8UTGLHAj8qMM71 qDiU5hfoI2b5niVRb2z1gaZAfNjJuHZyrO84MQlyfBIqWtsZe8X9e5r7EDA02osonrw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ymXi+L5w; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5792606A32A; Wed, 18 Nov 2026 19:30:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ymXi+L5w Received: by smtp.kernel.org (Postfix) with ESMTPSA id C127A1F000C4; Wed, 18 Nov 2026 19:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030211; bh=sQ1a2CEX74I0TuF4wQF07gROwJ89GQ8ND9ZuRX8VOt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ymXi+L5wPXituJ4797J4lO5+LlWP9itsriAKMbsxQwakexi60HzGfCkOjMH07SHnG yKeeiq1rzafWNCS++2wA0rzPC8dCGNAGdhxJjdB9b/ObUCkZ5hYIFW0hIbuKkdX3N0 +6aLjYyh+vFPaQv21/NQnr0x8Y+vrMUze9DXeDcs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ginger Li , Johannes Berg , Sasha Levin Subject: [PATCH 6.12 0624/1756] wifi: mac80211: Fix a race when expiring a mesh path Date: Wed, 18 Nov 2026 15:45:51 +0100 Message-ID: <20261118150033.736709695@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ginger Li [ Upstream commit 6571b6a24cc37c650a1815b1c320e30db5de466f ] My static analyzer identified a potential issue in 'net/mac80211/mesh_pathtbl.c': mpath_expired() reads mpath->flags and mpath->exp_time without holding mpath->state_lock, while mesh_path_fix_nexthop() and the other writers update both fields under that lock. In mpath_lookup() and __mesh_path_lookup_by_idx() the unlocked check is followed by taking the lock and clearing MESH_PATH_ACTIVE, so the check and the update are not atomic: CPU0 (mpath_lookup) CPU1 (mesh_path_fix_nexthop) mpath_expired() reads the stale flags/exp_time and returns true spin_lock_bh(&mpath->state_lock) mpath->exp_time = 0; mpath->flags = FIXED|SN_VALID; mesh_path_activate(mpath); spin_unlock_bh(&mpath->state_lock) spin_lock_bh(&mpath->state_lock) mpath->flags &= ~MESH_PATH_ACTIVE; spin_unlock_bh(&mpath->state_lock) A path which mesh_path_fix_nexthop() has just set up as MESH_PATH_FIXED and MESH_PATH_ACTIVE then has MESH_PATH_ACTIVE cleared again, and forwarding to that destination silently stops. Take mpath->state_lock before evaluating mpath_expired() so that the check and the clearing of MESH_PATH_ACTIVE are atomic with respect to the writers. Fixes: 60854fd94573 ("mac80211: mesh: convert path table to rhashtable") Signed-off-by: Ginger Li Link: https://patch.msgid.link/20260922054253.11976-1-ginger.jzllee@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mesh_pathtbl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 9f1b5c6a15840..26a34458fb792 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -247,9 +247,10 @@ static struct mesh_path *mpath_lookup(struct mesh_table *tbl, const u8 *dst, mpath = rhashtable_lookup(&tbl->rhead, dst, mesh_rht_params); - if (mpath && mpath_expired(mpath)) { + if (mpath) { spin_lock_bh(&mpath->state_lock); - mpath->flags &= ~MESH_PATH_ACTIVE; + if (mpath_expired(mpath)) + mpath->flags &= ~MESH_PATH_ACTIVE; spin_unlock_bh(&mpath->state_lock); } return mpath; @@ -290,11 +291,11 @@ __mesh_path_lookup_by_idx(struct mesh_table *tbl, int idx) if (!mpath) return NULL; - if (mpath_expired(mpath)) { - spin_lock_bh(&mpath->state_lock); + spin_lock_bh(&mpath->state_lock); + if (mpath_expired(mpath)) mpath->flags &= ~MESH_PATH_ACTIVE; - spin_unlock_bh(&mpath->state_lock); - } + spin_unlock_bh(&mpath->state_lock); + return mpath; } -- 2.53.0