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

Commit 4fd44a98 authored by Frank van der Linden's avatar Frank van der Linden Committed by David S. Miller
Browse files

tcp: verify the checksum of the first data segment in a new connection



commit 079096f1 ("tcp/dccp: install syn_recv requests into ehash
table") introduced an optimization for the handling of child sockets
created for a new TCP connection.

But this optimization passes any data associated with the last ACK of the
connection handshake up the stack without verifying its checksum, because it
calls tcp_child_process(), which in turn calls tcp_rcv_state_process()
directly.  These lower-level processing functions do not do any checksum
verification.

Insert a tcp_checksum_complete call in the TCP_NEW_SYN_RECEIVE path to
fix this.

Fixes: 079096f1 ("tcp/dccp: install syn_recv requests into ehash table")
Signed-off-by: default avatarFrank van der Linden <fllinden@amazon.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Tested-by: default avatarBalbir Singh <bsingharora@gmail.com>
Reviewed-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdf767ca
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1730,6 +1730,10 @@ int tcp_v4_rcv(struct sk_buff *skb)
			reqsk_put(req);
			goto discard_it;
		}
		if (tcp_checksum_complete(skb)) {
			reqsk_put(req);
			goto csum_error;
		}
		if (unlikely(sk->sk_state != TCP_LISTEN)) {
			inet_csk_reqsk_queue_drop_and_put(sk, req);
			goto lookup;
+4 −0
Original line number Diff line number Diff line
@@ -1479,6 +1479,10 @@ static int tcp_v6_rcv(struct sk_buff *skb)
			reqsk_put(req);
			goto discard_it;
		}
		if (tcp_checksum_complete(skb)) {
			reqsk_put(req);
			goto csum_error;
		}
		if (unlikely(sk->sk_state != TCP_LISTEN)) {
			inet_csk_reqsk_queue_drop_and_put(sk, req);
			goto lookup;