Skip to content

Commit 02b2faa

Browse files
edumazetdavem330
authored andcommitted
tcp: fix various issues for sockets morphing to listen state
Dmitry Vyukov reported a divide by 0 triggered by syzkaller, exploiting tcp_disconnect() path that was never really considered and/or used before syzkaller ;) I was not able to reproduce the bug, but it seems issues here are the three possible actions that assumed they would never trigger on a listener. 1) tcp_write_timer_handler 2) tcp_delack_timer_handler 3) MTU reduction Only IPv6 MTU reduction was properly testing TCP_CLOSE and TCP_LISTEN states from tcp_v6_mtu_reduced() Signed-off-by: Eric Dumazet <[email protected]> Reported-by: Dmitry Vyukov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b73d2da commit 02b2faa

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

net/ipv4/tcp_ipv4.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,13 @@ EXPORT_SYMBOL(tcp_v4_connect);
279279
*/
280280
void tcp_v4_mtu_reduced(struct sock *sk)
281281
{
282-
struct dst_entry *dst;
283282
struct inet_sock *inet = inet_sk(sk);
284-
u32 mtu = tcp_sk(sk)->mtu_info;
283+
struct dst_entry *dst;
284+
u32 mtu;
285285

286+
if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE))
287+
return;
288+
mtu = tcp_sk(sk)->mtu_info;
286289
dst = inet_csk_update_pmtu(sk, mtu);
287290
if (!dst)
288291
return;

net/ipv4/tcp_timer.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ void tcp_delack_timer_handler(struct sock *sk)
249249

250250
sk_mem_reclaim_partial(sk);
251251

252-
if (sk->sk_state == TCP_CLOSE || !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
252+
if (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) ||
253+
!(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
253254
goto out;
254255

255256
if (time_after(icsk->icsk_ack.timeout, jiffies)) {
@@ -552,7 +553,8 @@ void tcp_write_timer_handler(struct sock *sk)
552553
struct inet_connection_sock *icsk = inet_csk(sk);
553554
int event;
554555

555-
if (sk->sk_state == TCP_CLOSE || !icsk->icsk_pending)
556+
if (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) ||
557+
!icsk->icsk_pending)
556558
goto out;
557559

558560
if (time_after(icsk->icsk_timeout, jiffies)) {

0 commit comments

Comments
 (0)