diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-03 14:59:38 -0800 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2017-04-05 13:25:24 +0100 |
| commit | 668206b0162c888f98803c226b51978c9289eb59 (patch) | |
| tree | 6d9e09cd7825fb0b2767f9442ba9a50d94bd8e40 | |
| parent | e3e57568921b362f0b7469c87ce8eb8443bc4a8c (diff) | |
BACKPORT: tcp: avoid infinite loop in tcp_splice_read()
Splicing from TCP socket is vulnerable when a packet with URG flag is
received and stored into receive queue.
__tcp_splice_read() returns 0, and sk_wait_data() immediately
returns since there is the problematic skb in queue.
This is a nice way to burn cpu (aka infinite loop) and trigger
soft lockups.
Again, this gem was found by syzkaller tool.
Fixes: 9c55e01c0cc8 ("[TCP]: Splice receive support.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: Ic8000917deb6ce7ca4ce2af0c8ce951355051ec9
| -rw-r--r-- | net/ipv4/tcp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4fcfaf86931..9fe51f80d91 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -785,6 +785,12 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, ret = -EAGAIN; break; } + /* if __tcp_splice_read() got nothing while we have + * an skb in receive queue, we do not want to loop. + * This might happen with URG data. + */ + if (!skb_queue_empty(&sk->sk_receive_queue)) + break; sk_wait_data(sk, &timeo); if (signal_pending(current)) { ret = sock_intr_errno(timeo); |