summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-03-05 10:48:35 -0800
committerDavid S. Miller <davem@davemloft.net>2008-03-05 10:48:35 -0800
commitc20121ae87955cfc8b51f89072294fc6077f39ad (patch)
tree05f46eec2d1d3c472f1f980f8e38f8a00fb5140a /net/ipv6/ip6_output.c
parent4591db4f37618f37a9f1f25d291c3c7a43a15a21 (diff)
downloadop-kernel-dev-c20121ae87955cfc8b51f89072294fc6077f39ad.zip
op-kernel-dev-c20121ae87955cfc8b51f89072294fc6077f39ad.tar.gz
[NETNS][IPV6] route6 - pass always a valid socket to ip6_dst_lookup
The ip6_dst_lookup receive a socket as parameter. In some part of the code it is called with a NULL socket parameter. We want to rely on the socket to retrieve the network namespace, so we always pass a valid socket in all cases. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 161afd1..9370185 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -913,7 +913,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
int err;
if (*dst == NULL)
- *dst = ip6_route_output(&init_net, sk, fl);
+ *dst = ip6_route_output(sk->sk_net, sk, fl);
if ((err = (*dst)->error))
goto out_err_release;
@@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
dst_release(*dst);
memcpy(&fl_gw, fl, sizeof(struct flowi));
memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr));
- *dst = ip6_route_output(&init_net, sk, &fl_gw);
+ *dst = ip6_route_output(sk->sk_net, sk, &fl_gw);
if ((err = (*dst)->error))
goto out_err_release;
}
OpenPOWER on IntegriCloud