[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>

diff --git a/net/core/dst.c b/net/core/dst.c
index f538061f4b93c22358969e370d6beca4e1b28780..5c6cfc4e7fdbe2bcaf393b9e1692834cfe3c0b74 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -279,11 +279,11 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
        if (!unregister) {
                dst->input = dst->output = dst_discard;
        } else {
-               dst->dev = init_net.loopback_dev;
+               dst->dev = dst->dev->nd_net->loopback_dev;
                dev_hold(dst->dev);
                dev_put(dev);
                if (dst->neighbour && dst->neighbour->dev == dev) {
-                       dst->neighbour->dev = init_net.loopback_dev;
+                       dst->neighbour->dev = dst->dev;
                        dev_put(dev);
                        dev_hold(dst->neighbour->dev);
                }

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index d95e48e8d65cfde1002d053eecc8d1c59752f60e..b576f8cd4019a750b5e528633373eaca27451cc1 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1512,8 +1512,9 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 {
        struct rtable *rt = (struct rtable *) dst;
        struct in_device *idev = rt->idev;
-       if (dev != init_net.loopback_dev && idev && idev->dev == dev) {
-               struct in_device *loopback_idev = in_dev_get(init_net.loopback_dev);
+       if (dev != dev->nd_net->loopback_dev && idev && idev->dev == dev) {
+               struct in_device *loopback_idev =
+                       in_dev_get(dev->nd_net->loopback_dev);
                if (loopback_idev) {
                        rt->idev = loopback_idev;
                        in_dev_put(idev);

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index b4948c170b3ea37ac4c41a17901bdd4ff9ba2f35..10b72d185bb9c5450a89a2199cec5a772fe3a770 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -214,7 +214,8 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 
        xdst = (struct xfrm_dst *)dst;
        if (xdst->u.rt.idev->dev == dev) {
-               struct in_device *loopback_idev = in_dev_get(init_net.loopback_dev);
+               struct in_device *loopback_idev =
+                       in_dev_get(dev->nd_net->loopback_dev);
                BUG_ON(!loopback_idev);
 
                do {

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e2c980dbe52dabcf7d4a0d25a2b930e831948d24..452111fa4c5242340367a53fb615db501a0a951f 100644 (file)
--- 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 a31dd531e191802dab91330293322202169f5856..4d54951cea0855af046506b8356a5cd167e9af59 100644 (file)
--- 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 {

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index a76280a14e72a3269af4fdd28dd3dd360c029c9b..95dc581861e8298e1c67b3dcf3a038f4d3c554a9 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1934,7 +1934,7 @@ static int stale_bundle(struct dst_entry *dst)
 void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev)
 {
        while ((dst = dst->child) && dst->xfrm && dst->dev == dev) {
-               dst->dev = init_net.loopback_dev;
+               dst->dev = dev->nd_net->loopback_dev;
                dev_hold(dst->dev);
                dev_put(dev);
        }