From nobody Tue Jan 16 19:05:15 2024 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 4TDz3b3gpDz57qym; Tue, 16 Jan 2024 19:05:15 +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 4TDz3b25xpz54k5; Tue, 16 Jan 2024 19:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431915; 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=WXrHOHgvI6sToF6lzS14MEO0520J2qa1Z1HPFeujqKA=; b=jWVawO/0zvfmUENPZCC0XLRPfkN6fznPBKbLn+SWl1SuoI8l/KD039d/pTPfKteCwB75HR FVQJB3b7aFeTu33WTwPKlTSuPx61lPFEqSnrmm5IHqWft5DZso9rKDpKOUoAiSRn9GD6qU Kp3wrVC6qSKFbk5ajrJEfv5pnjsSkZ9OzMsThXc5rjmTRzp0o2bwTZ6Z8OD9PIMTRs5CL3 JhIzALFaW5Ka5zs0azyV/dr0YAhFxJb7ILUwoNybO7shuHojHJdzrPMhYSEYb8ISmxmZMB ZqlOy1jEqd0U3KuuSG8XDZERg9TSJJ2TXty+winp8C+1oROXpJaSzDit/SDcMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431915; 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=WXrHOHgvI6sToF6lzS14MEO0520J2qa1Z1HPFeujqKA=; b=EgrR+0P81PLINr3EDPlLx+U7NpzOjtI1yAZKX37KgyHiPM7OcfOHwqr28XYBXQtCOwmiBM gQ6YUP2UtS8QSNtQ3SoOXZwmhL1L8jdKNAoXeQ6YWlNl4ujLfpls/oDJib5w1qOzoZgG/k faBkVrga3UO7GSa4GiTCRf+CHRs6NEkkmGuVHHoEsMG/GGomoA9gBIkhYP2Ykvmvp4XIVj BGIk/Rd8UbxKvdAa0LYn56LMU9l4SWXYPVrAQ4iGOM3pkZ3zuRRex3gRsoRcCj+DFiYemQ k430+76bjrPflI9VpWOft8wMnwrWOI2UszmiAYLt/GQ2Db13+KG7lAWInE5V/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705431915; a=rsa-sha256; cv=none; b=FU1xzCnw+tfqqgaOA6rfqIOnKGNT7ucWZPDdzuHojDTe3INABbNCakOL21iSnshwW3g0XS hSxZYnLe5nQf1jR61fHp6Z0fNBXnAMyCH9uzwnMTGPsRgTj3nW76wvwQWWVob95tgUOPiw wYA/TorH6J5T2kySSCBZlmzG/ZUDGQl14qHNIXdKojxUpR/5vqUBR9J4n3ug+TzLICBgMI VNilWLAFMIfLr5okn0FzUTHfLTzu8nv9wdh6Y5sGGjCpS0NEWhwHBUO1o0Tiku/c96wyR+ 1M/l+UEUzAfvPTdoCECBHAesna4bxokap2mshraP+sI7ukZcqO/Cz3vGtFZlOw== 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 4TDz3b19g2zsbf; Tue, 16 Jan 2024 19:05:15 +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 40GJ5Fg4010160; Tue, 16 Jan 2024 19:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GJ5FqV010157; Tue, 16 Jan 2024 19:05:15 GMT (envelope-from git) Date: Tue, 16 Jan 2024 19:05:15 GMT Message-Id: <202401161905.40GJ5FqV010157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 22d80d2226e0 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 22d80d2226e0c762d192d545068086c68071b36f Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=22d80d2226e0c762d192d545068086c68071b36f commit 22d80d2226e0c762d192d545068086c68071b36f Author: Gleb Smirnoff AuthorDate: 2023-12-07 22:41:36 +0000 Commit: Gleb Smirnoff 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