mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-18 02:19:39 +00:00
tcp: partially undo D43792
At the destruction of the tcpcb, no timers are supposed to
be running. However, it turns out that stopping them in the
close() / shutdown() call does not have the desired effect
under all circumstances.
This partially reverts 62d47d73b7
to reduce the nuisance
caused.
PR: 277009
Reported-by: syzbot+9a9aa434a14a2b35c3ba@syzkaller.appspotmail.com
Reported-by: syzbot+e82856782410e895bae7@syzkaller.appspotmail.com
Reviewed By: glebius, tuexen, #transport
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D43855
This commit is contained in:
parent
fd6d47375a
commit
57e27ff07a
@ -2383,9 +2383,10 @@ tcp_discardcb(struct tcpcb *tp)
|
||||
#endif
|
||||
|
||||
INP_WLOCK_ASSERT(inp);
|
||||
MPASS(!callout_active(&tp->t_callout));
|
||||
MPASS(TAILQ_EMPTY(&tp->snd_holes));
|
||||
|
||||
tcp_timer_stop(tp);
|
||||
|
||||
/* free the reassembly queue, if any */
|
||||
tcp_reass_flush(tp);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user