From: Simon Wunderlich <sw@simonwunderlich.de>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
b.a.t.m.a.n@lists.open-mesh.org, Ruijie Li <ruijieli51@gmail.com>,
stable@kernel.org, Yuan Tan <yuantan098@gmail.com>,
Yifan Wu <yifanwucs@gmail.com>,
Juefei Pu <tomapufckgml@gmail.com>, Xin Liu <bird@lzu.edu.cn>,
Zhanpeng Li <lzhanpeng2025@lzu.edu.cn>,
Ren Wei <n05ec@lzu.edu.cn>, Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH net 10/14] batman-adv: clear current gateway during teardown
Date: Fri, 15 May 2026 11:55:35 +0200 [thread overview]
Message-ID: <20260515095540.325586-11-sw@simonwunderlich.de> (raw)
In-Reply-To: <20260515095540.325586-1-sw@simonwunderlich.de>
From: Ruijie Li <ruijieli51@gmail.com>
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 <yuantan098@gmail.com>
Reported-by: Yifan Wu <yifanwucs@gmail.com>
Reported-by: Juefei Pu <tomapufckgml@gmail.com>
Reported-by: Xin Liu <bird@lzu.edu.cn>
Signed-off-by: Ruijie Li <ruijieli51@gmail.com>
Signed-off-by: Zhanpeng Li <lzhanpeng2025@lzu.edu.cn>
Signed-off-by: Ren Wei <n05ec@lzu.edu.cn>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/gateway_client.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 51e9c081a2a4e..a9d0346e8332e 100644
--- 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_priv *bat_priv,
*/
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);
--
2.47.3
next prev parent reply other threads:[~2026-05-15 9:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 9:55 [PATCH net 00/14] pull request: batman-adv 2026-05-15 Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 01/14] batman-adv: fix tp_meter counter underflow during shutdown Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 02/14] batman-adv: tp_meter: fix tp_vars reference leak in receiver shutdown Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 03/14] batman-adv: tt: reject oversized local TVLV buffers Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 04/14] batman-adv: tt: fix negative tt_buff_len Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 05/14] batman-adv: tt: fix negative last_changeset_len Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 06/14] batman-adv: tt: fix TOCTOU race for reported vlans Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 07/14] batman-adv: tt: avoid empty VLAN responses Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 08/14] batman-adv: tt: prevent TVLV entry number overflow Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 09/14] batman-adv: fix fragment reassembly length accounting Simon Wunderlich
2026-05-15 9:55 ` Simon Wunderlich [this message]
2026-05-15 9:55 ` [PATCH net 11/14] batman-adv: dat: handle forward allocation error Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 12/14] batman-adv: tp_meter: avoid use of uninit sender vars Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 13/14] batman-adv: frag: disallow unicast fragment in fragment Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 14/14] batman-adv: tp_meter: directly shut down timer on cleanup Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260515095540.325586-11-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bird@lzu.edu.cn \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=lzhanpeng2025@lzu.edu.cn \
--cc=n05ec@lzu.edu.cn \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ruijieli51@gmail.com \
--cc=stable@kernel.org \
--cc=sven@narfation.org \
--cc=tomapufckgml@gmail.com \
--cc=yifanwucs@gmail.com \
--cc=yuantan098@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox