diff options
| author | Denis V. Lunev <den@openvz.org> | 2007-12-07 00:38:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:44 -0800 |
| commit | 5a3e55d68ec5baac578bf32ba67607088c763657 (patch) | |
| tree | 9e8f9dfae66c8a85735122ece8a9c85cdb5c31c4 /net/ipv6 | |
| parent | b84a2189c4e1835c51fd6b974a0497be9bc4ba87 (diff) | |
| download | op-kernel-dev-5a3e55d68ec5baac578bf32ba67607088c763657.zip op-kernel-dev-5a3e55d68ec5baac578bf32ba67607088c763657.tar.gz | |
[NET]: Multiple namespaces in the all dst_ifdown routines.
Move dst entries to a namespace loopback to catch refcounting leaks.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 7 | ||||
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e2c980d..452111f 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -216,9 +216,12 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, { struct rt6_info *rt = (struct rt6_info *)dst; struct inet6_dev *idev = rt->rt6i_idev; + struct net_device *loopback_dev = + dev->nd_net->loopback_dev; - if (dev != init_net.loopback_dev && idev != NULL && idev->dev == dev) { - struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); + if (dev != loopback_dev && idev != NULL && idev->dev == dev) { + struct inet6_dev *loopback_idev = + in6_dev_get(loopback_dev); if (loopback_idev != NULL) { rt->rt6i_idev = loopback_idev; in6_dev_put(idev); diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index a31dd53..4d54951 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -229,7 +229,8 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, xdst = (struct xfrm_dst *)dst; if (xdst->u.rt6.rt6i_idev->dev == dev) { - struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); + struct inet6_dev *loopback_idev = + in6_dev_get(dev->nd_net->loopback_dev); BUG_ON(!loopback_idev); do { |
