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

Commit 5d299f3d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: ipv6: fix TCP early demux 



IPv6 needs a cookie in dst_check() call.

We need to add rx_dst_cookie and provide a family independent
sk_rx_dst_set(sk, skb) method to properly support IPv6 TCP early demux.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5497eeb

include/linux/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ struct ipv6_pinfo { 
	__u8			rcv_tclass;



	__u32			dst_cookie;

	__u32			rx_dst_cookie;



	struct ipv6_mc_socklist	__rcu *ipv6_mc_list;

	struct ipv6_ac_socklist	*ipv6_ac_list;

include/net/inet_connection_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct inet_connection_sock_af_ops { 
	int	    (*queue_xmit)(struct sk_buff *skb, struct flowi *fl);

	void	    (*send_check)(struct sock *sk, struct sk_buff *skb);

	int	    (*rebuild_header)(struct sock *sk);

	void	    (*sk_rx_dst_set)(struct sock *sk, const struct sk_buff *skb);

	int	    (*conn_request)(struct sock *sk, struct sk_buff *skb);

	struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,

				      struct request_sock *req,

include/net/inet_sock.h

+0 −9
Original line number Diff line number Diff line
@@ -249,13 +249,4 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk) 
	return flags;

}



static inline void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)

{

	struct dst_entry *dst = skb_dst(skb);



	dst_hold(dst);

	sk->sk_rx_dst = dst;

	inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;

}



#endif	/* _INET_SOCK_H */

net/ipv4/tcp_input.c

+3 −1
Original line number Diff line number Diff line
@@ -5392,6 +5392,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
{

	struct tcp_sock *tp = tcp_sk(sk);



	if (unlikely(sk->sk_rx_dst == NULL))

		inet_csk(sk)->icsk_af_ops->sk_rx_dst_set(sk, skb);

	/*

	 *	Header prediction.

	 *	The code loosely follows the one in the famous
@@ -5605,7 +5607,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb) 
	tcp_set_state(sk, TCP_ESTABLISHED);



	if (skb != NULL) {

		inet_sk_rx_dst_set(sk, skb);

		icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);

		security_inet_conn_established(sk, skb);

	}

net/ipv4/tcp_ipv4.c

+10 −3
Original line number Diff line number Diff line
@@ -1627,9 +1627,6 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
				sk->sk_rx_dst = NULL;

			}

		}

		if (unlikely(sk->sk_rx_dst == NULL))

			inet_sk_rx_dst_set(sk, skb);



		if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {

			rsk = sk;

			goto reset;
@@ -1872,10 +1869,20 @@ static struct timewait_sock_ops tcp_timewait_sock_ops = { 
	.twsk_destructor= tcp_twsk_destructor,

};



static void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)

{

	struct dst_entry *dst = skb_dst(skb);



	dst_hold(dst);

	sk->sk_rx_dst = dst;

	inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;

}



const struct inet_connection_sock_af_ops ipv4_specific = {

	.queue_xmit	   = ip_queue_xmit,

	.send_check	   = tcp_v4_send_check,

	.rebuild_header	   = inet_sk_rebuild_header,

	.sk_rx_dst_set	   = inet_sk_rx_dst_set,

	.conn_request	   = tcp_v4_conn_request,

	.syn_recv_sock	   = tcp_v4_syn_recv_sock,

	.net_header_len	   = sizeof(struct iphdr),