Commit da9855dd authored by Frank van der Linden's avatar Frank van der Linden Committed by Stefan Bader

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

BugLink: https://bugs.launchpad.net/bugs/1784382

[ Upstream commit 4fd44a98 ]

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 96eebe5a
...@@ -1627,6 +1627,10 @@ int tcp_v4_rcv(struct sk_buff *skb) ...@@ -1627,6 +1627,10 @@ int tcp_v4_rcv(struct sk_buff *skb)
reqsk_put(req); reqsk_put(req);
goto discard_it; goto discard_it;
} }
if (tcp_checksum_complete(skb)) {
reqsk_put(req);
goto csum_error;
}
if (unlikely(sk->sk_state != TCP_LISTEN)) { if (unlikely(sk->sk_state != TCP_LISTEN)) {
inet_csk_reqsk_queue_drop_and_put(sk, req); inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup; goto lookup;
......
...@@ -1415,6 +1415,10 @@ static int tcp_v6_rcv(struct sk_buff *skb) ...@@ -1415,6 +1415,10 @@ static int tcp_v6_rcv(struct sk_buff *skb)
reqsk_put(req); reqsk_put(req);
goto discard_it; goto discard_it;
} }
if (tcp_checksum_complete(skb)) {
reqsk_put(req);
goto csum_error;
}
if (unlikely(sk->sk_state != TCP_LISTEN)) { if (unlikely(sk->sk_state != TCP_LISTEN)) {
inet_csk_reqsk_queue_drop_and_put(sk, req); inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup; goto lookup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment