Revert "vlan: Fix VLAN 0 memory leak"
Subsystems (2)
PATCH 1/1 Revert "vlan: Fix VLAN 0 memory leak"
This reverts commit 718cb09aaa6fa78cc8124e9517efbc6c92665384.
The commit triggers multiple syzbot issues, probably due to possibility of manually creating VLAN 0 on netdevice which will cause the code to delete it since it can't distinguish such VLAN from implicit VLAN 0 automatically created for devices with NETIF_F_HW_VLAN_CTAG_FILTER feature.
--- net/8021q/vlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/8021q/vlan.c +2 -1
@@ -384,7 +384,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, dev->name);vlan_vid_add (dev,htons (ETH_P_8021Q ),0 ); } -if (event ==NETDEV_DOWN ) +if (event ==NETDEV_DOWN && + (dev->features &NETIF_F_HW_VLAN_CTAG_FILTER ))vlan_vid_del (dev,htons (ETH_P_8021Q ),0 ); vlan_info =rtnl_dereference (dev->vlan_info);
Signature · 1 line
2.39.2
Quoted 7 lines · Vlad Buslov
This reverts commit
718cb09aaa6fa78cc8124e9517efbc6c92665384.The commit triggers multiple syzbot issues, probably due to possibility of manually creating VLAN 0 on netdevice which will cause the code to delete it since it can't distinguish such VLAN from implicit VLAN 0 automatically created for devices with
NETIF_F_HW_VLAN_CTAG_FILTERfeature.
Quoted 8 lines
Reported-by [email protected]Reported-by [email protected]Reported-by [email protected]Fixes 718cb09aaa6f ("vlan: Fix VLAN 0 memory leak")Signed-off-by Vlad Buslov <[email protected]>
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 11 Aug 2023 17:45:23 +0200 you wrote:
This reverts commit
718cb09aaa6fa78cc8124e9517efbc6c92665384.The commit triggers multiple syzbot issues, probably due to possibility of manually creating VLAN 0 on netdevice which will cause the code to delete it since it can't distinguish such VLAN from implicit VLAN 0 automatically created for devices with
NETIF_F_HW_VLAN_CTAG_FILTERfeature.[...]
Here is the summary with links:
- [net] Revert "vlan: Fix VLAN 0 memory leak"
https://git.kernel.org/netdev/net/c/ace0ab3a4b54
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html