From nobody Tue May 12 20:05:55 2026 X-Original-To: dev-commits-src-main@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 4gFSJh0pnkz6d1K1 for ; Tue, 12 May 2026 20:05:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJh0CVDz3ZJj for ; Tue, 12 May 2026 20:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616356; 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=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=wveCqxK4vC/U3qaNQ7ua0QAUU4tVoPPsHxtKcS4X1rbKFKj+4UbH+HGLU/3w8kn4i0gdIc +ypLas64HwObyVmK5+mTOBjANlI5GLS3UlZprxcviAB6DQtzENOdt0i3UoS8hlLpcfOtmZ x/iH8TFsKXMDIo4H1dGbb5UPI3X2vg13d6hSDcR09UeCwqDEGw6PW7NHb0qQ6EyA4alfiq P2/nMTksL+0uhEGejnwwWy2D7sN3cqhQ8DjXI01B21euXtkZ+pG5NGjDrBnmkPIOdscA/b y2eQSivGky/XUrOYd/u+0E/EndlpSaWAOdJGQZ7pb0CaPJtl+UKcSH/JiCxOWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616356; a=rsa-sha256; cv=none; b=XiLsSXxFFUSOmRj1hPosEkJKKtfsBV85HWNv3v25ZBCx8TN846r5duu7JeG6jdsMXEu5ul ArHsXA7NGt9QqD22mdZmN/V4rcG5rLKaoEDvdyz4EVnk1aHEnvm6ad3yj7WsWFpWg1qGnl /gusKPf/RIUPkgmZvPaumRb3Q/5MKhVCeexkB35o/cJJpDLWOdk0iO06A8PHxWjb8H3IAz /+nr3vRjbvicxI7SOaZkYPjHU0yax4lkw+FW8esuTZXMp5bNdnMZ6UopAHPO/qASMs3Q/Z S3rc07h1lyhjHICa5/ftSo1D1Q+0yodBnL8P8batMFJ0LGQjqqNuxB7UiCsbdg== 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=1778616356; 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=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=xO//7NYOmtKBXFi4j7K99OE56IXMCakrhqppEAjmXcNDeMvcz+PcjrRNBB8+1cB85rfdBb u6I6R8eVlQQKkyMZw5XrLe0Y7gXdfN6zeWVlGCTQ9Y6aNR5LknYYsktIvoK32vOyrNYEfz SwP/3RLMZ2aVsoz8opLsWHVFjKkdMxKPrUpbqFJR18CtSx7LSXB9YM1ShgP+q1H7gWmrY/ IKx80OeHuVS05/fss3ui8YzxGBly/HHP9uWGesJ2HJTAilRcK9mqQVqwUIKBmPGsNV5vPb BFLktaBYa56A9WdeQkdRDcxTD8g5H58ZFuUdJ8mZBVxrgYDQldGQ/3rJnH5umg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJg6fYdz2m5 for ; Tue, 12 May 2026 20:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26bffe5695d7 - main - tests/tcp_hpts_test: Fix more resource leaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26bffe5695d7cab2e797ce4ad153f324c0262f48 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:55 +0000 Message-Id: <6a038823.22d84.f4d7a67@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26bffe5695d7cab2e797ce4ad153f324c0262f48 commit 26bffe5695d7cab2e797ce4ad153f324c0262f48 Author: Mark Johnston AuthorDate: 2026-05-12 17:44:31 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 tests/tcp_hpts_test: Fix more resource leaks Address leaks that I missed in commit f7bf9fd6199c ("tests/tcp_hpts_test: Fix resource leaks"). Reviewed by: Nick Banks , tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56943 --- sys/netinet/tcp_hpts_test.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index bc61b64b8c58..25c3a939e86d 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -624,7 +624,9 @@ KTEST_FUNC(tcpcb_insertion) struct tcpcb *tp; struct tcp_hpts_entry *hpts; uint32_t timeout_usecs = 10; + int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false); @@ -638,9 +640,9 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tp->t_flags2 |= TF2_HPTS_CALLS; - KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 0); + KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 0, cleanup_locked); tcp_hpts_insert(pace, tp, timeout_usecs, NULL); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_ONQUEUE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_ONQUEUE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 1); @@ -656,7 +658,7 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tcp_hpts_remove(pace, tp); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_NONE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_NONE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_VERIFY(!tcp_in_hpts(tp)); @@ -668,6 +670,10 @@ KTEST_FUNC(tcpcb_insertion) tcp_hptsi_destroy(pace); return (0); + +cleanup_locked: + INP_WUNLOCK(&tp->t_inpcb); + return (error); } /* @@ -1475,6 +1481,7 @@ KTEST_FUNC(direct_wake_mechanism) struct tcp_hpts_entry *hpts; int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false);