Skip to content

Commit e3d5ea2

Browse files
edumazetkuba-moo
authored andcommitted
tcp: make tcp_read_sock() more robust
If recv_actor() returns an incorrect value, tcp_read_sock() might loop forever. Instead, issue a one time warning and make sure to make progress. Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Jakub Sitnicki <jakub@cloudflare.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Link: https://lore.kernel.org/r/20220302161723.3910001-2-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 60ce37b commit e3d5ea2

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

net/ipv4/tcp.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,11 +1684,13 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
16841684
if (!copied)
16851685
copied = used;
16861686
break;
1687-
} else if (used <= len) {
1688-
seq += used;
1689-
copied += used;
1690-
offset += used;
16911687
}
1688+
if (WARN_ON_ONCE(used > len))
1689+
used = len;
1690+
seq += used;
1691+
copied += used;
1692+
offset += used;
1693+
16921694
/* If recv_actor drops the lock (e.g. TCP splice
16931695
* receive) the skb pointer might be invalid when
16941696
* getting here: tcp_collapse might have deleted it

0 commit comments

Comments
 (0)