diff options
| author | Dan Carpenter | 2013-08-19 09:05:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-08-21 00:12:15 +0200 |
| commit | ea857f28ab5ca82508e70ffbc8cb296705133f01 (patch) | |
| tree | 77b8faadb781bdf6253d815b12233473270add10 /net | |
| parent | myri10ge: Add support for ndo_busy_poll (diff) | |
| download | kernel-qcow2-linux-ea857f28ab5ca82508e70ffbc8cb296705133f01.tar.gz kernel-qcow2-linux-ea857f28ab5ca82508e70ffbc8cb296705133f01.tar.xz kernel-qcow2-linux-ea857f28ab5ca82508e70ffbc8cb296705133f01.zip | |
ipip: dereferencing an ERR_PTR in ip_tunnel_init_net()
We need to move the derefernce after the IS_ERR() check.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index a4d9126c7b51..24549b4aeae2 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -854,14 +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); - /* 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; 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; return 0; } |