Commit 5a3e55d6 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller

[NET]: Multiple namespaces in the all dst_ifdown routines.

Move dst entries to a namespace loopback to catch refcounting leaks.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b84a2189
...@@ -279,11 +279,11 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -279,11 +279,11 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
if (!unregister) { if (!unregister) {
dst->input = dst->output = dst_discard; dst->input = dst->output = dst_discard;
} else { } else {
dst->dev = init_net.loopback_dev; dst->dev = dst->dev->nd_net->loopback_dev;
dev_hold(dst->dev); dev_hold(dst->dev);
dev_put(dev); dev_put(dev);
if (dst->neighbour && dst->neighbour->dev == dev) { if (dst->neighbour && dst->neighbour->dev == dev) {
dst->neighbour->dev = init_net.loopback_dev; dst->neighbour->dev = dst->dev;
dev_put(dev); dev_put(dev);
dev_hold(dst->neighbour->dev); dev_hold(dst->neighbour->dev);
} }
......
...@@ -1512,8 +1512,9 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -1512,8 +1512,9 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
{ {
struct rtable *rt = (struct rtable *) dst; struct rtable *rt = (struct rtable *) dst;
struct in_device *idev = rt->idev; struct in_device *idev = rt->idev;
if (dev != init_net.loopback_dev && idev && idev->dev == dev) { if (dev != dev->nd_net->loopback_dev && idev && 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);
if (loopback_idev) { if (loopback_idev) {
rt->idev = loopback_idev; rt->idev = loopback_idev;
in_dev_put(idev); in_dev_put(idev);
......
...@@ -214,7 +214,8 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -214,7 +214,8 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
xdst = (struct xfrm_dst *)dst; xdst = (struct xfrm_dst *)dst;
if (xdst->u.rt.idev->dev == dev) { 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); BUG_ON(!loopback_idev);
do { do {
......
...@@ -216,9 +216,12 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -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 rt6_info *rt = (struct rt6_info *)dst;
struct inet6_dev *idev = rt->rt6i_idev; 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) { if (dev != loopback_dev && idev != NULL && idev->dev == dev) {
struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); struct inet6_dev *loopback_idev =
in6_dev_get(loopback_dev);
if (loopback_idev != NULL) { if (loopback_idev != NULL) {
rt->rt6i_idev = loopback_idev; rt->rt6i_idev = loopback_idev;
in6_dev_put(idev); in6_dev_put(idev);
......
...@@ -229,7 +229,8 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -229,7 +229,8 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
xdst = (struct xfrm_dst *)dst; xdst = (struct xfrm_dst *)dst;
if (xdst->u.rt6.rt6i_idev->dev == dev) { 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); BUG_ON(!loopback_idev);
do { do {
......
...@@ -1934,7 +1934,7 @@ static int stale_bundle(struct dst_entry *dst) ...@@ -1934,7 +1934,7 @@ static int stale_bundle(struct dst_entry *dst)
void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev) void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev)
{ {
while ((dst = dst->child) && dst->xfrm && dst->dev == 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_hold(dst->dev);
dev_put(dev); dev_put(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment