Skip to contentSkip to conversation

net: hsr: fix memory leak on slave unregistration by removing synced VLANs

PATCH Applied Eric Dumazet 4 participants 4 messages Jul 21 – Jul 22

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: hsr: fix memory leak on slave unregistration by removing synced VLANs

When an HSR master device is brought UP, it auto-adds VLAN 0 via vlan_vid0_add(), which propagates VID 0 to its slave devices (slave A and B).

If a slave device is later unregistered while HSR is active (e.g., during netns cleanup or interface destruction), hsr_del_port() is called to detach the slave port from the HSR master. However, hsr_del_port() currently does not delete the VLAN IDs that were synced to the slave device by HSR.

As a result, the slave device retains a refcount on VID 0 (and any other synced VLANs). When the slave device is destroyed, its vlan_info / vlan_vid_info structure remains allocated, leading to a memory leak.

Fix this by calling vlan_vids_del_by_dev(port->dev, master->dev) in hsr_del_port() before unlinking slave A or slave B ports, matching the propagation logic in hsr_ndo_vlan_rx_add_vid() / hsr_ndo_vlan_rx_kill_vid() and the cleanup behavior in bonding and team drivers.

Fixes 1a8a63a5305e ("net: hsr: Add VLAN CTAG filter support")
Reported-by [email protected]
Cc Felix Maurer <[email protected]>
Cc Fernando Fernandez Mancera <[email protected]>

---
v2: incorporated Sashiko's feedback
v1: https://lore.kernel.org/netdev/[email protected]/

 net/hsr/hsr_slave.c | 2 ++
 1 file changed, 2 insertions(+)
net/hsr/hsr_slave.c +2 -0
index d9af9e65f72f07b1997b80c85db16d812fbda488..01c73b4b50ddd89afa74defa37fa83d40c401cf8 100644
@@ -242,6 +242,8 @@ void hsr_del_port(struct hsr_port *port)
 		netdev_rx_handler_unregister(port->dev);
 		if (!port->hsr->fwd_offloaded)
 			dev_set_promiscuity(port->dev, -1);
+		if (port->type == HSR_PT_SLAVE_A || port->type == HSR_PT_SLAVE_B)
+			vlan_vids_del_by_dev(port->dev, master->dev);
 		netdev_upper_dev_unlink(port->dev, master->dev);
 		if (hsr->prot_version == PRP_V1 &&
 		    port->type == HSR_PT_SLAVE_B) {
Signature · 1 line
2.55.0.229.g6434b31f56-goog
Reviewed-by on v2 1/1
#1 lore raw
Quoted 17 lines · Eric Dumazet

When an HSR master device is brought UP, it auto-adds VLAN 0 via vlan_vid0_add(), which propagates VID 0 to its slave devices (slave A and B).

If a slave device is later unregistered while HSR is active (e.g., during netns cleanup or interface destruction), hsr_del_port() is called to detach the slave port from the HSR master. However, hsr_del_port() currently does not delete the VLAN IDs that were synced to the slave device by HSR.

As a result, the slave device retains a refcount on VID 0 (and any other synced VLANs). When the slave device is destroyed, its vlan_info / vlan_vid_info structure remains allocated, leading to a memory leak.

Fix this by calling vlan_vids_del_by_dev(port->dev, master->dev) in hsr_del_port() before unlinking slave A or slave B ports, matching the propagation logic in hsr_ndo_vlan_rx_add_vid() / hsr_ndo_vlan_rx_kill_vid() and the cleanup behavior in bonding and team drivers.

Quoted 6 lines
Fixes 1a8a63a5305e ("net: hsr: Add VLAN CTAG filter support")
Reported-by [email protected]
Cc Felix Maurer <[email protected]>
Cc Fernando Fernandez Mancera <[email protected]>

Nice catch on Sashiko's feedback, thanks.

Reviewed-by on v2 1/1
#2 lore raw
In reply to Eric Dumazet
Quoted 17 lines · Eric Dumazet

When an HSR master device is brought UP, it auto-adds VLAN 0 via vlan_vid0_add(), which propagates VID 0 to its slave devices (slave A and B).

If a slave device is later unregistered while HSR is active (e.g., during netns cleanup or interface destruction), hsr_del_port() is called to detach the slave port from the HSR master. However, hsr_del_port() currently does not delete the VLAN IDs that were synced to the slave device by HSR.

As a result, the slave device retains a refcount on VID 0 (and any other synced VLANs). When the slave device is destroyed, its vlan_info / vlan_vid_info structure remains allocated, leading to a memory leak.

Fix this by calling vlan_vids_del_by_dev(port->dev, master->dev) in hsr_del_port() before unlinking slave A or slave B ports, matching the propagation logic in hsr_ndo_vlan_rx_add_vid() / hsr_ndo_vlan_rx_kill_vid() and the cleanup behavior in bonding and team drivers.

Quoted 6 lines
Fixes 1a8a63a5305e ("net: hsr: Add VLAN CTAG filter support")
Reported-by [email protected]
Cc Felix Maurer <[email protected]>
Cc Fernando Fernandez Mancera <[email protected]>

Looks good to me, thank you!

#3 lore raw
In reply to Eric Dumazet
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Tue, 21 Jul 2026 10:12:40 +0000 you wrote:

When an HSR master device is brought UP, it auto-adds VLAN 0 via vlan_vid0_add(), which propagates VID 0 to its slave devices (slave A and B).

If a slave device is later unregistered while HSR is active (e.g., during netns cleanup or interface destruction), hsr_del_port() is called to detach the slave port from the HSR master. However, hsr_del_port() currently does not delete the VLAN IDs that were synced to the slave device by HSR.

[...]

Here is the summary with links:
- [v2,net] net: hsr: fix memory leak on slave unregistration by removing synced VLANs

    https://git.kernel.org/netdev/net/c/dcf15eaf5641

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html