Skip to content

Commit

Permalink
[NETNS]: Correct namespace for connect-time routing.
Browse files Browse the repository at this point in the history
ip_route_connect and ip_route_newports are a part of routing API
presented to the socket layer. The namespace is available inside them
through a socket.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Jan 28, 2008
1 parent 7ba699c commit eee8059
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions include/net/route.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <linux/ip.h>
#include <linux/cache.h>
#include <linux/security.h>
#include <net/sock.h>

#ifndef __KERNEL__
#warning This file is not supposed to be used outside of kernel.
Expand Down Expand Up @@ -157,8 +158,9 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
.dport = dport } } };

int err;
struct net *net = sk->sk_net;
if (!dst || !src) {
err = __ip_route_output_key(&init_net, rp, &fl);
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
fl.fl4_dst = (*rp)->rt_dst;
Expand All @@ -167,7 +169,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
*rp = NULL;
}
security_sk_classify_flow(sk, &fl);
return ip_route_output_flow(&init_net, rp, &fl, sk, flags);
return ip_route_output_flow(net, rp, &fl, sk, flags);
}

static inline int ip_route_newports(struct rtable **rp, u8 protocol,
Expand All @@ -184,7 +186,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol,
ip_rt_put(*rp);
*rp = NULL;
security_sk_classify_flow(sk, &fl);
return ip_route_output_flow(&init_net, rp, &fl, sk, 0);
return ip_route_output_flow(sk->sk_net, rp, &fl, sk, 0);
}
return 0;
}
Expand Down

0 comments on commit eee8059

Please sign in to comment.