From nobody Thu Dec 7 22:42:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmTmP5prRz53kPR; Thu, 7 Dec 2023 22:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmTmP46Bsz3Psh; Thu, 7 Dec 2023 22:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDYc/Mnc59OgIwxCclbIDxgL14/Pfg9bmIJp1Bk5kHI=; b=yLHSTo+3ISw7uWg1jin2tybn7ipLiCcuusszj5d8zgFkSdkXgJrGgGqRN/M0dc1hbJqhPy VTS49wTkohU6Dd7plBUj2YSvqRdAFoycQWVvWhFybgsHlHrr2y9Iox3YSOqJPQIyRPxmjA eizldlJoC64uPIRQwzqfj4uN6guUYfRrKsRRvFfkg5U6Gzg2zdPg6XCuDAr/4ZNE0Hx4dW ri261J1XIY33HFPPEy/pKgVHbjANliXBjG9RDHuSG8/MWAsfCDOKeeuURbv2juQflYn2+P X8clYHvgh3LM2jE+bB72oA2tVbb96ZlX17ImPwEyDpFzEJX+iG1XQo8asJEgNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701988933; a=rsa-sha256; cv=none; b=h0q6nOdi+obA6jlzj1B+hHUWm8wUWE+MnnLL9FBup/N+nAUrCHtS6m3DyUri7JJq2z6XUE dy7hZdIZlU1X1vcYLq36m1cpftlqhFxn39klIfgcNY/03RqRpiZlXE8QGizzp3iaf3MQpN J6yVtDi0X735cgZs+43fFUNvaNV7zADaSY4P2nKrO1zkCMww9Zop8NuGBkCym9lLw0dvMb tlwtMO6E1D0RrTcwc1O2tcX3uf6TfLBV/SB6BFdfPrtSM+7LYuJokXnyUkrHVZIp6NcXxn sPKnDvwLe9IUStQ73ykAk6M3d1EF0ziOxGlwMEcD/Arxc/lYJGh8H5Rv9k2fuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701988933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDYc/Mnc59OgIwxCclbIDxgL14/Pfg9bmIJp1Bk5kHI=; b=P3KrxAXuvpmLqmaXbTfxYwU9K3L0bChOR2nkFOMXRIZQPSZPnwfK3sqvnrOM+GtR7zBdaf 0xEffa1hEk8U7VBXfwTOodGdG3vq+nbuDHfMMEilCG2kimSdolGV/Xw3m5/iWQBCPFm007 j/y7jVLo59a/7Tlm1kky1lOtodqd/l6ekZRjYmFWqgb0vo9dYoN68bDW8KwpMogcjI+zwc EjsxBf5eH4OKSdab1TEzfC13tBtJbAQZUq+Z39s62MVT/Xo7YKlTG07JHTdJ7B+rQJDxe7 +2VRT+UcpojD8beq2+kGLcQD1OWQIOhkFfeJdqphZTZz1DMK0AuwPb7q9s92Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SmTmP3DBWzw9F; Thu, 7 Dec 2023 22:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7MgDje073751; Thu, 7 Dec 2023 22:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7MgDG7073748; Thu, 7 Dec 2023 22:42:13 GMT (envelope-from git) Date: Thu, 7 Dec 2023 22:42:13 GMT Message-Id: <202312072242.3B7MgDG7073748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ade05d63b727 - main - tcp: stop stack timers in tcp_switch_back_to_default() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb commit ade05d63b727d5e8d0d833c1d974a9d50d4cb1bb Author: Gleb Smirnoff AuthorDate: 2023-12-07 22:41:36 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-07 22:41:36 +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 --- 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 d951b5df938e..c79cadd04944 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -542,6 +542,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