Date: Tue, 16 Jan 2024 19:05:15 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 22d80d2226e0 - stable/14 - tcp: stop stack timers in tcp_switch_back_to_default() Message-ID: <202401161905.40GJ5FqV010157@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=22d80d2226e0c762d192d545068086c68071b36f commit 22d80d2226e0c762d192d545068086c68071b36f Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2023-12-07 22:41:36 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2024-01-16 18:47:49 +0000 tcp: stop stack timers in tcp_switch_back_to_default() This funcion is an alternative code path that detaches an alternative TCP stack, missed in d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d. Reviewed by: rrs, tuexen Differential Revision: https://reviews.freebsd.org/D42917 Reported-by: syzbot+186130be9f0ca5557d4e@syzkaller.appspotmail.com Fixes: d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d (cherry picked from commit ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb) --- sys/netinet/tcp_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 023078d1d4f9..4e28f7917bdf 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -544,6 +544,9 @@ tcp_switch_back_to_default(struct tcpcb *tp) KASSERT(tp->t_fb != &tcp_def_funcblk, ("%s: called by the built-in default stack", __func__)); + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); + /* * Now, we'll find a new function block to use. * Start by trying the current user-selected
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401161905.40GJ5FqV010157>