AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sit: fix percpu stats accounting

Browse Source 
commit 15fc1f7056 (sit: percpu stats accounting) forgot the fallback
tunnel case (sit0), and can crash pretty fast.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2010-09-28 02:17:58 +00:00 committed by David S. Miller
parent fada5636fe
commit dd4080ee57
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv6/sit.c
View File

@ -1160,7 +1160,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
return 0; return 0;
} }
static void __net_init ipip6_fb_tunnel_init(struct net_device *dev) static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
{ {
struct ip_tunnel *tunnel = netdev_priv(dev); struct ip_tunnel *tunnel = netdev_priv(dev);
struct iphdr *iph = &tunnel->parms.iph; struct iphdr *iph = &tunnel->parms.iph;
@ -1175,8 +1175,12 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev)
iph->ihl = 5; iph->ihl = 5;
iph->ttl = 64; iph->ttl = 64;
dev->tstats = alloc_percpu(struct pcpu_tstats);
if (!dev->tstats)
return -ENOMEM;
dev_hold(dev); dev_hold(dev);
sitn->tunnels_wc[0] = tunnel; sitn->tunnels_wc[0] = tunnel;
return 0;
} }
static struct xfrm_tunnel sit_handler __read_mostly = { static struct xfrm_tunnel sit_handler __read_mostly = {
@ -1220,7 +1224,10 @@ static int __net_init sit_init_net(struct net *net)
} }
dev_net_set(sitn->fb_tunnel_dev, net); dev_net_set(sitn->fb_tunnel_dev, net);
ipip6_fb_tunnel_init(sitn->fb_tunnel_dev); err = ipip6_fb_tunnel_init(sitn->fb_tunnel_dev);
if (err)
goto err_dev_free;
ipip6_tunnel_clone_6rd(sitn->fb_tunnel_dev, sitn); ipip6_tunnel_clone_6rd(sitn->fb_tunnel_dev, sitn);
if ((err = register_netdev(sitn->fb_tunnel_dev))) if ((err = register_netdev(sitn->fb_tunnel_dev)))
@ -1230,7 +1237,8 @@ static int __net_init sit_init_net(struct net *net)
err_reg_dev: err_reg_dev:
dev_put(sitn->fb_tunnel_dev); dev_put(sitn->fb_tunnel_dev);
free_netdev(sitn->fb_tunnel_dev); err_dev_free:
ipip6_dev_free(sitn->fb_tunnel_dev);
err_alloc_dev: err_alloc_dev:
return err; return err;
} }