mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 04:06:22 +00:00
[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>
This commit is contained in:
parent
b84a2189c4
commit
5a3e55d68e
6 changed files with 15 additions and 9 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue