FAILED: patch "[PATCH] batman-adv: clean untagged VLAN on netdev registration" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 8669a550c752d86baebc5fdc83b8ff35c4372c0e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072026-unmindful-haunt-2787@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8669a550c752d86baebc5fdc83b8ff35c4372c0e Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sat, 4 Jul 2026 09:46:09 +0200
Subject: [PATCH] batman-adv: clean untagged VLAN on netdev registration
failure
When an mesh interface is registered, it creates an untagged struct batadv_meshif_vlan on top of it via the NETDEV_REGISTER notifier. But in this process, another receiver of this notification can veto the registration. The netdev registration will be aborted because of this veto.
The register_netdevice() call will try to clean up the net_device using unregister_netdevice_queue() - which only uses the .priv_destructor to free private resources. In this situation, .dellink will not be called.
The cleanup of the untagged batadv_meshif_vlan must thefore be done in the destructor to avoid a leak of this object.
net/batman-adv/main.c +8 -0
@@ -259,6 +259,7 @@ int batadv_mesh_init(struct net_device *mesh_iface)void batadv_mesh_free (struct net_device *mesh_iface) {struct batadv_priv *bat_priv =netdev_priv (mesh_iface); +struct batadv_meshif_vlan *vlan;WRITE_ONCE (bat_priv->mesh_state,BATADV_MESH_DEACTIVATING );
@@ -273,6 +274,13 @@ void batadv_mesh_free(struct net_device *mesh_iface)batadv_mcast_free (bat_priv); +/* destroy the "untagged" VLAN */ + vlan =batadv_meshif_vlan_get (bat_priv,BATADV_NO_FLAGS ); +if (vlan) { +batadv_meshif_destroy_vlan (bat_priv, vlan); +batadv_meshif_vlan_put (vlan); + } +/* Free the TT and the originator tables only after having terminated * all the other depending components which may use these structures for * their purposes.
net/batman-adv/mesh-interface.c +2 -11
@@ -595,8 +595,8 @@ int batadv_meshif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)* @bat_priv: the bat priv with all the mesh interface information * @vlan: the object to remove */ -static void batadv_meshif_destroy_vlan (struct batadv_priv *bat_priv, -struct batadv_meshif_vlan *vlan) +void batadv_meshif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_meshif_vlan *vlan) {/* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag
@@ -1091,22 +1091,13 @@ static int batadv_meshif_newlink(struct net_device *dev,static void batadv_meshif_destroy_netlink (struct net_device *mesh_iface,struct list_head *head) { -struct batadv_priv *bat_priv =netdev_priv (mesh_iface);struct batadv_hard_iface *hard_iface; -struct batadv_meshif_vlan *vlan;while (!list_empty (&mesh_iface->adj_list.lower)) { hard_iface =netdev_adjacent_get_private (mesh_iface->adj_list.lower.next);batadv_hardif_disable_interface (hard_iface); } -/* destroy the "untagged" VLAN */ - vlan =batadv_meshif_vlan_get (bat_priv,BATADV_NO_FLAGS ); -if (vlan) { -batadv_meshif_destroy_vlan (bat_priv, vlan); -batadv_meshif_vlan_put (vlan); - } -unregister_netdevice_queue (mesh_iface, head); }
net/batman-adv/mesh-interface.h +2 -0
@@ -21,6 +21,8 @@ void batadv_interface_rx(struct net_device *mesh_iface,bool batadv_meshif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops;int batadv_meshif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid); +void batadv_meshif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_meshif_vlan *vlan);void batadv_meshif_vlan_release (struct kref *ref);struct batadv_meshif_vlan *batadv_meshif_vlan_get (struct batadv_priv *bat_priv,unsigned short vid);
Sven Eckelmann
maintainerPATCH 1/1 batman-adv: clean untagged VLAN on netdev registration failure
commit 8669a550c752d86baebc5fdc83b8ff35c4372c0e upstream.
When an mesh interface is registered, it creates an untagged struct batadv_meshif_vlan on top of it via the NETDEV_REGISTER notifier. But in this process, another receiver of this notification can veto the registration. The netdev registration will be aborted because of this veto.
The register_netdevice() call will try to clean up the net_device using unregister_netdevice_queue() - which only uses the .priv_destructor to free private resources. In this situation, .dellink will not be called.
The cleanup of the untagged batadv_meshif_vlan must thefore be done in the destructor to avoid a leak of this object.
--- net/batman-adv/main.c | 8 ++++++++ net/batman-adv/soft-interface.c | 13 ++----------- net/batman-adv/soft-interface.h | 2 ++ 3 files changed, 12 insertions(+), 11 deletions(-)
net/batman-adv/main.c +8 -0
@@ -265,6 +265,7 @@ int batadv_mesh_init(struct net_device *soft_iface)void batadv_mesh_free (struct net_device *soft_iface) {struct batadv_priv *bat_priv =netdev_priv (soft_iface); +struct batadv_softif_vlan *vlan;atomic_set (&bat_priv->mesh_state,BATADV_MESH_DEACTIVATING );
@@ -280,6 +281,13 @@ void batadv_mesh_free(struct net_device *soft_iface)batadv_mcast_free (bat_priv); +/* destroy the "untagged" VLAN */ + vlan =batadv_softif_vlan_get (bat_priv,BATADV_NO_FLAGS ); +if (vlan) { +batadv_softif_destroy_vlan (bat_priv, vlan); +batadv_softif_vlan_put (vlan); + } +/* Free the TT and the originator tables only after having terminated * all the other depending components which may use these structures for * their purposes.
net/batman-adv/soft-interface.c +2 -11
@@ -625,8 +625,8 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)* @bat_priv: the bat priv with all the soft interface information * @vlan: the object to remove */ -static void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, -struct batadv_softif_vlan *vlan) +void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_softif_vlan *vlan) {/* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag
@@ -1130,9 +1130,7 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface)static void batadv_softif_destroy_netlink (struct net_device *soft_iface,struct list_head *head) { -struct batadv_priv *bat_priv =netdev_priv (soft_iface);struct batadv_hard_iface *hard_iface; -struct batadv_softif_vlan *vlan;list_for_each_entry (hard_iface, &batadv_hardif_list, list) {if (hard_iface->soft_iface == soft_iface)
@@ -1140,13 +1138,6 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, BATADV_IF_CLEANUP_KEEP); } -/* destroy the "untagged" VLAN */ - vlan =batadv_softif_vlan_get (bat_priv,BATADV_NO_FLAGS ); -if (vlan) { -batadv_softif_destroy_vlan (bat_priv, vlan); -batadv_softif_vlan_put (vlan); - } -batadv_sysfs_del_meshif (soft_iface);unregister_netdevice_queue (soft_iface, head); }
net/batman-adv/soft-interface.h +2 -0
@@ -25,6 +25,8 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface);bool batadv_softif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops;int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid); +void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_softif_vlan *vlan);void batadv_softif_vlan_release (struct kref *ref);struct batadv_softif_vlan *batadv_softif_vlan_get (struct batadv_priv *bat_priv,unsigned short vid);
Signature · 1 line
2.47.3
Sasha Levin
maintainerRe: [PATCH 5.10.y] batman-adv: clean untagged VLAN on netdev registration failure
Quoted 3 lines
The
register_netdevice()call will try to clean up thenet_deviceusingunregister_netdevice_queue()- which only uses the .priv_destructor to free private resources. In this situation, .dellink will not be called.
On 5.10 this move regresses normal interface removal: 5.10 still has the legacy sysfs code, and batadv_softif_destroy_netlink() removes the mesh kobject via batadv_sysfs_del_meshif() before the untagged VLAN cleanup (now running from batadv_mesh_free()) gets to batadv_sysfs_del_vlan(), so every plain "ip link del" hits a kernfs WARN (a panic under panic_on_warn).
Could you send a v2 for 5.10 that keeps the untagged VLAN destroy in batadv_softif_destroy_netlink() and only adds the batadv_mesh_free() fallback for the registration-veto path?
I've queued the 6.12/6.6/6.1/5.15 versions.
Signature · 2 lines
Thanks, Sasha
Sven Eckelmann
maintainerRe: [PATCH 5.10.y] batman-adv: clean untagged VLAN on netdev registration failure
Quoted 10 lines · On Tuesday, 21 July 2026 02:56:30 CEST Sasha Levin wrote:
Quoted 3 lines
The
register_netdevice()call will try to clean up thenet_deviceusingunregister_netdevice_queue()- which only uses the .priv_destructor to free private resources. In this situation, .dellink will not be called.On 5.10 this move regresses normal interface removal: 5.10 still has the legacy sysfs code, and
batadv_softif_destroy_netlink()removes the mesh kobject viabatadv_sysfs_del_meshif()before the untagged VLAN cleanup (now running frombatadv_mesh_free()) gets tobatadv_sysfs_del_vlan(), so every plain "ip link del" hits a kernfs WARN (a panic underpanic_on_warn).
Correct, this is a situation which will now always be triggered when CONFIG_BATMAN_ADV_SYSFS is enabled (which wasn't enabled by me for ages - aka 6 years).
Had to check the old code. With CONFIG_BATMAN_ADV_SYSFS enabled, the deletion of the VLAN must be done before batadv_sysfs_del_meshif(). But batadv_softif_destroy_netlink first does the batadv_sysfs_del_meshif and then calls unregister_netdevice_queue(). This is also the same for the batadv_softif_destroy_sysfs() which I forgot to modify in this backport.
Quoted 3 lines
Could you send a v2 for 5.10 that keeps the untagged VLAN destroy in
batadv_softif_destroy_netlink()and only adds thebatadv_mesh_free()fallback for the registration-veto path?
And here comes the problem:
I don't know at the moment what is the best way to detect that batadv_mesh_free() was reached via the veto path and not through the normal cleanup. And if we call it here in the normal cleanup, it would cause a segfault in
RIP: 0010:sysfs_remove_file_ns (fs/sysfs/file.c:470) ? batadv_tt_local_remove (./arch/x86/include/asm/atomic.h:190 (discriminator 4) ./include/asm-generic/atomic-instrumented.h:221 (discriminator 4) ./include/linux/refcount.h:272 (discriminator 4) ./include/linux/refcount.h:315 (discriminator 4) ./include/linux/refcount.h:333 (discriminator 4) ./include/linux/kref.h:64 (discriminator 4) net/batman-adv/translation-table.c:254 (discriminator 4) net/batman-adv/translation-table.c:1440 (discriminator 4)) batadv_sysfs_del_vlan (net/batman-adv/sysfs.c:930 (discriminator 1)) ? batadv_softif_vlan_release (net/batman-adv/soft-interface.c:545) batadv_softif_destroy_vlan (net/batman-adv/soft-interface.h:41 net/batman-adv/soft-interface.c:642) batadv_mesh_free (./include/linux/instrumented.h:101 ./include/asm-generic/atomic-instrumented.h:220 ./include/linux/refcount.h:272 ./include/linux/refcount.h:315 ./include/linux/refcount.h:333 ./include/linux/kref.h:64 net/batman-adv/soft-interface.h:44 net/batman-adv/main.c:293) batadv_softif_free (net/batman-adv/soft-interface.c:1045) netdev_run_todo (net/core/dev.c:10346)
(depending on the order of batadv_softif_vlan_put)
As workaround, I can use a simple boolean flag in netdev_priv to signal that it is called from a normal softif_destroy function or not. Not that explicit but also possible would be a check for "(!dev->needs_free_netdev)". But this was just a little bit too obscure for me. I will post the v2 with the more explicit flag in batadv_priv.
Otherwise I need to rewrite everything and handle both the untagged VLAN removal and the batadv_sysfs_del_meshif() from a NETDEV_UNREGISTER handler in batadv_hardif_event_softif().
Regards,
Sven
Sven Eckelmann
maintainerPATCH v2 1/1 batman-adv: clean untagged VLAN on netdev registration failure
In reply to [email protected]commit 8669a550c752d86baebc5fdc83b8ff35c4372c0e upstream.
When an mesh interface is registered, it creates an untagged struct batadv_meshif_vlan on top of it via the NETDEV_REGISTER notifier. But in this process, another receiver of this notification can veto the registration. The netdev registration will be aborted because of this veto.
The register_netdevice() call will try to clean up the net_device using unregister_netdevice_queue() - which only uses the .priv_destructor to free private resources. In this situation, .dellink will not be called.
The cleanup of the untagged batadv_meshif_vlan must thefore be done in the destructor to avoid a leak of this object.
[ switch to old "mesh_iface" name "soft_iface", Context, keep early
batadv_softif_destroy_netlink() cleanup in case sysfs support is active, only run destructor VLAN code on non-softif_destroy context ]
--- net/batman-adv/main.c | 17 +++++++++++++++++ net/batman-adv/soft-interface.c | 7 +++++-- net/batman-adv/soft-interface.h | 2 ++ net/batman-adv/types.h | 7 +++++++ 4 files changed, 31 insertions(+), 2 deletions(-)
net/batman-adv/main.c +17 -0
@@ -265,6 +265,7 @@ int batadv_mesh_init(struct net_device *soft_iface)void batadv_mesh_free (struct net_device *soft_iface) {struct batadv_priv *bat_priv =netdev_priv (soft_iface); +struct batadv_softif_vlan *vlan;atomic_set (&bat_priv->mesh_state,BATADV_MESH_DEACTIVATING );
@@ -280,6 +281,22 @@ void batadv_mesh_free(struct net_device *soft_iface)batadv_mcast_free (bat_priv); +/* destroy the "untagged" VLAN in case of an register_netdevice() error. +* +* It will be handled normally by batadv_softif_destroy_netlink() and +* batadv_softif_destroy_sysfs() before they call batadv_sysfs_del_meshif(). +* +* But when a veto was received during the registration, the VLAN has to +* be cleaned up in the destructor. +*/ +if (!bat_priv->softif_destroy) { + vlan =batadv_softif_vlan_get (bat_priv,BATADV_NO_FLAGS ); +if (vlan) { +batadv_softif_destroy_vlan (bat_priv, vlan); +batadv_softif_vlan_put (vlan); + } + } +/* Free the TT and the originator tables only after having terminated * all the other depending components which may use these structures for * their purposes.
net/batman-adv/soft-interface.c +5 -2
@@ -625,8 +625,8 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)* @bat_priv: the bat priv with all the soft interface information * @vlan: the object to remove */ -static void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, -struct batadv_softif_vlan *vlan) +void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_softif_vlan *vlan) {/* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag
@@ -830,6 +830,7 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->tt.last_changeset_len =0 ; bat_priv->isolation_mark =0 ; bat_priv->isolation_mark_mask =0 ; + bat_priv->softif_destroy = false;/* randomize initial seqno to avoid collision */ get_random_bytes (&random_seqno,sizeof (random_seqno));
@@ -1117,6 +1118,7 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface)batadv_softif_vlan_put (vlan); } + bat_priv->softif_destroy = true;batadv_sysfs_del_meshif (soft_iface);unregister_netdevice (soft_iface); }
@@ -1147,6 +1149,7 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface,batadv_softif_vlan_put (vlan); } + bat_priv->softif_destroy = true;batadv_sysfs_del_meshif (soft_iface);unregister_netdevice_queue (soft_iface, head); }
net/batman-adv/soft-interface.h +2 -0
@@ -25,6 +25,8 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface);bool batadv_softif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops;int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid); +void batadv_softif_destroy_vlan (struct batadv_priv *bat_priv, +struct batadv_softif_vlan *vlan);void batadv_softif_vlan_release (struct kref *ref);struct batadv_softif_vlan *batadv_softif_vlan_get (struct batadv_priv *bat_priv,unsigned short vid);
net/batman-adv/types.h +7 -0
@@ -1791,6 +1791,13 @@ struct batadv_priv {/** @bat_v: B.A.T.M.A.N. V per soft-interface private data */ struct batadv_priv_bat_v bat_v;#endif + +/** +* @softif_destroy: whether the mesh_free() is called via the +* batadv_softif_destroy_sysfs() or batadv_softif_destroy_netlink() +* codepath and doesn't have to clean up the untagged VLAN (sysfs) +*/ + bool softif_destroy:1; };/**
Signature · 1 line
2.47.3