From nobody Mon Feb 12 21:40:51 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 4TYdDh1dyTz58xqP; Mon, 12 Feb 2024 21:40:52 +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 4TYdDh0ScQz4J92; Mon, 12 Feb 2024 21:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707774052; 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=J+qJp9dAuoAGeN5ti7A/lbCQaO/rHbZfadIPGS2udVs=; b=RPzmbdl2yFL0VQu09TnqIDSl7pOyZ2T1eWmeYv8juKua95O3pBtyHBCQweMBPfj6nofGTn LP9VQ4r1xfUNyV1Nk6hlpTpClReGBoHU9D3mWXwQ3wyIyX1xrpzFjRNZvswOlAM2P3UL+i DLwSaV05zqQkb368SG0alQh/tQ0ISVlDtW7PoOGjHKMsCzOOiROI1XEjJ95Hq05UPb/5Ig XsEHdXJhwu4dO9ZQPIUdQtccqSAJzKx+18V7PdppRE03hk62evwd6NbfyIwjKfEKHWenPr x2T6kUz9qKwwzb0MPrHjcraDDKvMorOobs3IOZjH3cQz+G6v25snNyTuH/Xw9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707774052; a=rsa-sha256; cv=none; b=Qg/SswYRF82EiFy0aMoGEnbeDFQNGu5qOCaRIDlhzOQODgdFeSo1MW6YadvZm6qeJox9M/ eTve6oWi9/8tleFOU3zCKEDvmau73CR94KJtRWOdFeX0JVpSCG87+sFwqTt/BCoBkjs5Vr uTYNivKjgvNeUcGzmVCgGftDfTaO7MhkdlDl3DL+N+fgjFDeg316qMHQNvJqsJVZCn/pFW Ve8YeZrSsy0eAWWu1LkMeFDWQdeyVfvdrlqXO73qxk2RkAKvtl+e99bDODs3wBuk9RXP6G 4QpEMkhTeV1xNtMUrmsUZ/udiuVUc4dOtzBvrYGJzfL92XvNvBzpFxuSm/QXFQ== 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=1707774052; 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=J+qJp9dAuoAGeN5ti7A/lbCQaO/rHbZfadIPGS2udVs=; b=UlYLYM84IPzmYrkxi+N+fdWAW5BLhM14cNkPwmzGH4WSKXpXIyfLI0c3cSslpVkrqbEFiT j6ILlzgp18oZfkzo99nqr/fwsVJv6+E3hQiK0zHIovajVMXZ1kvuEIU71POzeiKPuel0uM pD8NgUXA+8RbEcED7i0iXjjk5igjfirREuKGmQ92j1gEl+EkrN2B7kuRodSH5aV70GkVtq E520jIywt+NVi81GdVBOrMymKqYfgQLDMNmbFZkXzqce73/V1qYM0G19miqnJxMYbpU2bq MEG7OC9ZEGp0F8je2b3Qv9D919kBts/3MSBv/Qq0jLL9GwIil5B1K4jkqrk3tw== 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 4TYdDg6g0czp6q; Mon, 12 Feb 2024 21:40:51 +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 41CLepIR009844; Mon, 12 Feb 2024 21:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CLepnF009841; Mon, 12 Feb 2024 21:40:51 GMT (envelope-from git) Date: Mon, 12 Feb 2024 21:40:51 GMT Message-Id: <202402122140.41CLepnF009841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 57e27ff07aff - main - tcp: partially undo D43792 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57e27ff07aff35289892f79288bebf76a3c31fec Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=57e27ff07aff35289892f79288bebf76a3c31fec commit 57e27ff07aff35289892f79288bebf76a3c31fec Author: Richard Scheffenegger AuthorDate: 2024-02-12 20:43:18 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-12 21:38:11 +0000 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 62d47d73b7eb 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 --- sys/netinet/tcp_subr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 90e1496a822c..97d60ceba24d 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -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);