From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 CBC103016E0; Thu, 28 May 2026 20:20:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999653; cv=none; b=Emeq22HWpKGYNMCwEQ6tyxoDInS9sokEgGnk1OplnX+5ppyEYAPij+3xV1ETJYN08Nop0xI8ajRB8kja9BFH95PrFsVsrjoaJ1xMujH7mU0YE9f/0RE7tXfpS+RU9ZuRjVsH+TfcXWHYGPMWXDxeR7HV3QsR6AdSGyyHmzzqEx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999653; c=relaxed/simple; bh=+wqkMF8E7Vj8t0BYjHWHv/kBG0974VSLe4EkwWp75kI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EHQ40guMzTrgI887hnWXJoQaKt7NXljAA7F8StH9XsHxbbcRuxz47Yx+d+rmct0RSxrSGf7hZQXeWUUd774iKtrXlPZB2jG8nQ5pmM87g+9H1ifOWf7jOZD7ue5CywC46ZhJrm5d54drHZtzGzBsA04p7j2/anwWMAcCBMprlzk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PsRbwN78; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PsRbwN78" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BF721F000E9; Thu, 28 May 2026 20:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999652; bh=xwqzc1EHH90M1O0PQ9r/JaO2bbVb794u9r0mFTXZSGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PsRbwN78EF5BAi5RK06Dv0Vk/aNgxiiGpSzRZ/Nj7RQCqYxuvPoGQKsJChORa0rZa 5DolDfkjsaZwifSWePO78FvF5C8/ncWvIr600G7Lrz6ry/SIM0bGc7RxjCUmLu175U eGnNj3lCfRXOjs1G0n9TV3u1jqwKAO4hDAMrauTI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Ruijie Li , Zhanpeng Li , Ren Wei , Sven Eckelmann Subject: [PATCH 6.18 142/377] batman-adv: clear current gateway during teardown Date: Thu, 28 May 2026 21:46:20 +0200 Message-ID: <20260528194642.485655812@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@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: Ruijie Li commit a340a51ed801eab7bb454150c226323b865263cc upstream. batadv_gw_node_free() removes the gateway list entries during mesh teardown, but it does not clear the currently selected gateway. This leaves stale gateway state behind across cleanup and can break a later mesh recreation. Clear bat_priv->gw.curr_gw before walking the gateway list so the selected gateway reference is dropped as part of teardown. Fixes: 2265c1410864 ("batman-adv: gateway election code refactoring") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Ruijie Li Signed-off-by: Zhanpeng Li Signed-off-by: Ren Wei Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/gateway_client.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -478,10 +478,14 @@ void batadv_gw_node_delete(struct batadv */ void batadv_gw_node_free(struct batadv_priv *bat_priv) { + struct batadv_gw_node *curr_gw; struct batadv_gw_node *gw_node; struct hlist_node *node_tmp; spin_lock_bh(&bat_priv->gw.list_lock); + curr_gw = rcu_replace_pointer(bat_priv->gw.curr_gw, NULL, true); + batadv_gw_node_put(curr_gw); + hlist_for_each_entry_safe(gw_node, node_tmp, &bat_priv->gw.gateway_list, list) { hlist_del_init_rcu(&gw_node->list);