Skip to content

Commit

Permalink
vlan: link the upper neighbour only after registering
Browse files Browse the repository at this point in the history
Otherwise users might access it without being fully registered, as per
sysfs - it only inits in register_netdevice(), so is unusable till it is
called.

CC: Patrick McHardy <kaber@trash.net>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Sep 26, 2013
1 parent 4fee991 commit 5df27e6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/8021q/vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,13 @@ int register_vlan_dev(struct net_device *dev)
if (err < 0)
goto out_uninit_mvrp;

err = netdev_upper_dev_link(real_dev, dev);
if (err)
goto out_uninit_mvrp;

err = register_netdevice(dev);
if (err < 0)
goto out_upper_dev_unlink;
goto out_uninit_mvrp;

err = netdev_upper_dev_link(real_dev, dev);
if (err)
goto out_unregister_netdev;

/* Account for reference in struct vlan_dev_priv */
dev_hold(real_dev);
Expand All @@ -191,8 +191,8 @@ int register_vlan_dev(struct net_device *dev)

return 0;

out_upper_dev_unlink:
netdev_upper_dev_unlink(real_dev, dev);
out_unregister_netdev:
unregister_netdevice(dev);
out_uninit_mvrp:
if (grp->nr_vlan_devs == 0)
vlan_mvrp_uninit_applicant(real_dev);
Expand Down

0 comments on commit 5df27e6

Please sign in to comment.