Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da37705c authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

macvlan: unregister net device when netdev_upper_dev_link() fails 



rtnl_newlink() doesn't unregister it for us on failure.

Cc: Patrick McHardy <kaber@trash.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64380a04

drivers/net/macvlan.c

+3 −2
Original line number Diff line number Diff line
@@ -879,14 +879,15 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, 
	dev->priv_flags |= IFF_MACVLAN;

	err = netdev_upper_dev_link(lowerdev, dev);

	if (err)

		goto destroy_port;



		goto unregister_netdev;



	list_add_tail_rcu(&vlan->list, &port->vlans);

	netif_stacked_transfer_operstate(lowerdev, dev);



	return 0;



unregister_netdev:

	unregister_netdevice(dev);

destroy_port:

	port->count -= 1;

	if (!port->count)