tcp: repair: fix TCP_QUEUE_SEQ implementation
Subsystems (3)
PATCH 1/1 tcp: repair: fix TCP_QUEUE_SEQ implementation
When application uses TCP_QUEUE_SEQ socket option to change tp->rcv_next, we must also update tp->copied_seq.
Otherwise, stuff relying on tcp_inq() being precise can eventually be confused.
For example, tcp_zerocopy_receive() might crash because it does not expect tcp_recv_skb() to return NULL.
We could add tests in various places to fix the issue, or simply make sure tcp_inq() wont return a random value, and leave fast path as it is.
Note that this fixes ioctl(fd, SIOCINQ, &val) at the same time.
--- net/ipv4/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/tcp.c +3 -1
@@ -2948,8 +2948,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level, err = -EPERM ; else if (tp->repair_queue == TCP_SEND_QUEUE) WRITE_ONCE(tp->write_seq, val); - else if (tp->repair_queue == TCP_RECV_QUEUE) + else if (tp->repair_queue == TCP_RECV_QUEUE) {WRITE_ONCE (tp->rcv_nxt, val); +WRITE_ONCE (tp->copied_seq, val); + } else err = -EINVAL ;break ;
Signature · 1 line
2.25.1.481.gfbce0eb801-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Wed, 18 Mar 2020 19:21:02 -0700
Quoted 13 lines
When application uses
TCP_QUEUE_SEQsocket option to changetp->rcv_next, we must also updatetp->copied_seq.Otherwise, stuff relying on
tcp_inq()being precise can eventually be confused.For example,
tcp_zerocopy_receive()might crash because it does not expecttcp_recv_skb()to return NULL.We could add tests in various places to fix the issue, or simply make sure
tcp_inq()wont return a random value, and leave fast path as it is.
Quoted 7 lines
Note that this fixes
ioctl(fd, SIOCINQ, &val)at the same time.Fixes ee9952831cfd ("tcp: Initial repair mode")Fixes 05255b823a61 ("tcp: add TCP_ZEROCOPY_RECEIVE support for zerocopy receive")Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>
Applied and queued up for -stable, thanks Eric.