net: vlan: avoid leaks on register_vlan_dev() failures
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 net: vlan: avoid leaks on register_vlan_dev() failures
VLAN checks for NETREG_UNINITIALIZED to distinguish between registration failure and unregistration in progress.
Since commit cb626bf566eb ("net-sysfs: Fix reference count leak") registration failure may, however, result in NETREG_UNREGISTERED as well as NETREG_UNINITIALIZED.
This fix is similer to cebb69754f37 ("rtnetlink: Fix memory(net_device) leak when ->newlink fails")
---
Found by code inspection and compile-tested only.
net/8021q/vlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/8021q/vlan.c +2 -1
@@ -284,7 +284,8 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)return 0 ; out_free_newdev: -if (new_dev->reg_state ==NETREG_UNINITIALIZED ) +if (new_dev->reg_state ==NETREG_UNINITIALIZED || + new_dev->reg_state ==NETREG_UNREGISTERED )free_netdev (new_dev);return err; }
Signature · 1 line
2.26.2
David Miller
maintainerFrom: Jakub Kicinski <[email protected]>
Date: Wed, 30 Dec 2020 19:40:27 -0800
Quoted 7 lines
VLAN checks for
NETREG_UNINITIALIZEDto distinguish between registration failure and unregistration in progress.Since commit
cb626bf566eb("net-sysfs: Fix reference count leak") registration failure may, however, result inNETREG_UNREGISTEREDas well asNETREG_UNINITIALIZED.
Quoted 7 lines
This fix is similer to
cebb69754f37("rtnetlink: Fixmemory(net_device)leak when ->newlink fails")Fixes cb626bf566eb ("net-sysfs: Fix reference count leak")Signed-off-by Jakub Kicinski <[email protected]>---
Found by code inspection and compile-tested only.
This entire area is inconsistent, and confusing at best.
Applied and queued up for -stable, thanks.