diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-11-24 17:09:30 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-11-24 17:15:56 -0500 |
| commit | fbdd29bfd2da979b7ac6a0084af56624156c1069 (patch) | |
| tree | c019c641c0c6130a769a596561529253e49bec13 /net/ipv6/ip6mr.c | |
| parent | rxrpc: Correctly handle ack at end of client call transmit phase (diff) | |
| download | linux-dev-fbdd29bfd2da979b7ac6a0084af56624156c1069.tar.xz linux-dev-fbdd29bfd2da979b7ac6a0084af56624156c1069.zip | |
net: ipmr, ip6mr: fix vif/tunnel failure race condition
Since (at least) commit b17a7c179dd3 ("[NET]: Do sysfs registration as
part of register_netdevice."), netdev_run_todo() deals only with
unregistration, so we don't need to do the rtnl_unlock/lock cycle to
finish registration when failing pimreg or dvmrp device creation. In
fact that opens a race condition where someone can delete the device
while rtnl is unlocked because it's fully registered. The problem gets
worse when netlink support is introduced as there are more points of entry
that can cause it and it also makes reusing that code correctly impossible.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 7a4a1b81dbb6..a10e77103c88 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -765,10 +765,6 @@ static struct net_device *ip6mr_reg_vif(struct net *net, struct mr6_table *mrt) return dev; failure: - /* allow the register to be completed before unregistering. */ - rtnl_unlock(); - rtnl_lock(); - unregister_netdevice(dev); return NULL; } |