android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NETNS][IPV6] route6 - pass always a valid socket to ip6_dst_lookup

Browse Source 
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>
This commit is contained in:
Daniel Lezcano 2008-03-05 10:48:35 -08:00 committed by David S. Miller
parent 4591db4f37
commit c20121ae87
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/ip6_output.c
View File

@ -913,7 +913,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
int err; int err;
if (*dst == NULL) if (*dst == NULL)
*dst = ip6_route_output(&init_net, sk, fl); *dst = ip6_route_output(sk->sk_net, sk, fl);
if ((err = (*dst)->error)) if ((err = (*dst)->error))
goto out_err_release; goto out_err_release;
@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
dst_release(*dst); dst_release(*dst);
memcpy(&fl_gw, fl, sizeof(struct flowi)); memcpy(&fl_gw, fl, sizeof(struct flowi));
memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr)); 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)) if ((err = (*dst)->error))
goto out_err_release; goto out_err_release;
} }

9
net/ipv6/tcp_ipv6.c
View File

@ -1071,8 +1071,11 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
fl.fl_ip_sport = t1->source; fl.fl_ip_sport = t1->source;
security_skb_classify_flow(skb, &fl); security_skb_classify_flow(skb, &fl);
/* sk = NULL, but it is safe for now. RST socket required. */ /* Pass a socket to ip6_dst_lookup either it is for RST
if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { * Underlying function will use this to retrieve the network
* namespace
*/
if (!ip6_dst_lookup(tcp6_socket->sk, &buff->dst, &fl)) {
if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0); ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
@ -1172,7 +1175,7 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw,
fl.fl_ip_sport = t1->source; fl.fl_ip_sport = t1->source;
security_skb_classify_flow(skb, &fl); security_skb_classify_flow(skb, &fl);
if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { if (!ip6_dst_lookup(tcp6_socket->sk, &buff->dst, &fl)) {
if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0); ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);