diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-23 11:15:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-25 18:39:59 -0400 |
| commit | b4de77ade3fc56e41b978b68d78a351dab28b74e (patch) | |
| tree | 92e18e67c92a67d7ae83160a80c66b1767547840 | |
| parent | b8e2fde466f7902fed4ad10bb60c1377b27cbfb7 (diff) | |
| download | linux-stable-b4de77ade3fc56e41b978b68d78a351dab28b74e.tar.gz linux-stable-b4de77ade3fc56e41b978b68d78a351dab28b74e.tar.bz2 linux-stable-b4de77ade3fc56e41b978b68d78a351dab28b74e.zip | |
ipip: potential race in ip_tunnel_init_net()
Eric Dumazet says that my previous fix for an ERR_PTR dereference
(ea857f28ab 'ipip: dereferencing an ERR_PTR in ip_tunnel_init_net()')
could be racy and suggests the following fix instead.
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 24549b4aeae2..830de3f4e293 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -854,16 +854,14 @@ int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, rtnl_lock(); itn->fb_tunnel_dev = __ip_tunnel_create(net, ops, &parms); - rtnl_unlock(); - - if (IS_ERR(itn->fb_tunnel_dev)) - return PTR_ERR(itn->fb_tunnel_dev); /* FB netdevice is special: we have one, and only one per netns. * Allowing to move it to another netns is clearly unsafe. */ - itn->fb_tunnel_dev->features |= NETIF_F_NETNS_LOCAL; + if (!IS_ERR(itn->fb_tunnel_dev)) + itn->fb_tunnel_dev->features |= NETIF_F_NETNS_LOCAL; + rtnl_unlock(); - return 0; + return PTR_RET(itn->fb_tunnel_dev); } EXPORT_SYMBOL_GPL(ip_tunnel_init_net); |