Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c76a114 authored by Wang Yufen's avatar Wang Yufen Committed by David S. Miller
Browse files

ipv6: tcp_ipv6 policy route issue 



The issue raises when adding policy route, specify a particular
NIC as oif, the policy route did not take effect. The reason is
that fl6.oif is not set and route map failed. From the
tcp_v6_send_response function, if the binding address is linklocal,
fl6.oif is set, but not for global address.

Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60ea37f7

net/ipv6/tcp_ipv6.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -726,7 +726,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { 
#endif

#endif





static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,

static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,

				 u32 tsval, u32 tsecr,

				 u32 tsval, u32 tsecr, int oif,

				 struct tcp_md5sig_key *key, int rst, u8 tclass,

				 struct tcp_md5sig_key *key, int rst, u8 tclass,

				 u32 label)

				 u32 label)

{

{
@@ -798,8 +798,10 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win, 
	__tcp_v6_send_check(buff, &fl6.saddr, &fl6.daddr);

	__tcp_v6_send_check(buff, &fl6.saddr, &fl6.daddr);





	fl6.flowi6_proto = IPPROTO_TCP;

	fl6.flowi6_proto = IPPROTO_TCP;

	if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)

	if (rt6_need_strict(&fl6.daddr) || !oif)

		fl6.flowi6_oif = inet6_iif(skb);

		fl6.flowi6_oif = inet6_iif(skb);

	else

		fl6.flowi6_oif = oif;

	fl6.fl6_dport = t1->dest;

	fl6.fl6_dport = t1->dest;

	fl6.fl6_sport = t1->source;

	fl6.fl6_sport = t1->source;

	security_skb_classify_flow(skb, flowi6_to_flowi(&fl6));

	security_skb_classify_flow(skb, flowi6_to_flowi(&fl6));
@@ -833,6 +835,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) 
	int genhash;

	int genhash;

	struct sock *sk1 = NULL;

	struct sock *sk1 = NULL;

#endif

#endif

	int oif;





	if (th->rst)

	if (th->rst)

		return;

		return;
@@ -876,7 +879,8 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) 
		ack_seq = ntohl(th->seq) + th->syn + th->fin + skb->len -

		ack_seq = ntohl(th->seq) + th->syn + th->fin + skb->len -

			  (th->doff << 2);

			  (th->doff << 2);





	tcp_v6_send_response(skb, seq, ack_seq, 0, 0, 0, key, 1, 0, 0);

	oif = sk ? sk->sk_bound_dev_if : 0;

	tcp_v6_send_response(skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0, 0);





#ifdef CONFIG_TCP_MD5SIG

#ifdef CONFIG_TCP_MD5SIG

release_sk1:

release_sk1:
@@ -888,11 +892,11 @@ release_sk1: 
}

}





static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack,

static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack,

			    u32 win, u32 tsval, u32 tsecr,

			    u32 win, u32 tsval, u32 tsecr, int oif,

			    struct tcp_md5sig_key *key, u8 tclass,

			    struct tcp_md5sig_key *key, u8 tclass,

			    u32 label)

			    u32 label)

{

{

	tcp_v6_send_response(skb, seq, ack, win, tsval, tsecr, key, 0, tclass,

	tcp_v6_send_response(skb, seq, ack, win, tsval, tsecr, oif, key, 0, tclass,

			     label);

			     label);

}

}
@@ -904,7 +908,7 @@ static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb) 
	tcp_v6_send_ack(skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,

	tcp_v6_send_ack(skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,

			tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,

			tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,

			tcp_time_stamp + tcptw->tw_ts_offset,

			tcp_time_stamp + tcptw->tw_ts_offset,

			tcptw->tw_ts_recent, tcp_twsk_md5_key(tcptw),

			tcptw->tw_ts_recent, tw->tw_bound_dev_if, tcp_twsk_md5_key(tcptw),

			tw->tw_tclass, (tw->tw_flowlabel << 12));

			tw->tw_tclass, (tw->tw_flowlabel << 12));





	inet_twsk_put(tw);

	inet_twsk_put(tw);
@@ -914,7 +918,7 @@ static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, 
				  struct request_sock *req)

				  struct request_sock *req)

{

{

	tcp_v6_send_ack(skb, tcp_rsk(req)->snt_isn + 1, tcp_rsk(req)->rcv_isn + 1,

	tcp_v6_send_ack(skb, tcp_rsk(req)->snt_isn + 1, tcp_rsk(req)->rcv_isn + 1,

			req->rcv_wnd, tcp_time_stamp, req->ts_recent,

			req->rcv_wnd, tcp_time_stamp, req->ts_recent, sk->sk_bound_dev_if,

			tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr),

			tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr),

			0, 0);

			0, 0);

}

}