From nobody Tue May 12 20:05:55 2026 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 4gFSJn5Hvmz6d1Gn for ; Tue, 12 May 2026 20:06:01 +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 4gFSJn0FV4z3Ynr for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; 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=WKf7tr0w0w7pJHuR4kVzxVaOHDOJcLtMmVY+63g02eHw9i1tzYI8evDSXBA+AhQVwtfiO2 tMrCqUDySHwPc9WPtbamtN6n7G62vF/DbJ0s3TnRBldwKs/P9BLWitHipU0mrgd1uK4ICd tv5D1dh8sJieebtGelAXnEtNsUF5UbYiIFBta7M4Y9Q+Fizbt19OeLkoVX5WFAdIqr7h28 5blEOPePVviD6mbD4/gLpPNeLQgjJ5E0AnsG+MY2jOAq/filsl1/hVcPMC3c9Nb3x/wdbp uXqaB/XHWQJ7HjEl4XS1LmATeJiA2qb5zDCzRrXILrusHJbHJaVmzQg2XCv2eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616361; a=rsa-sha256; cv=none; b=IHh8ovUmbM+jHqPYulB/SIwonGk1W6pEVFXhZ+2wwewh39IBj4kRNZHRB+UkJgConHSt8N I+8O5PV0JDg3DYWXdO1jI8Uz+N6E4Edc1h+gEwehEscDWFfI0/aoL9RBzJ2AsmACt3GzRJ CNkVrJTC4+dLkNAbvgpGKHqQa1boXuj0JzZnvzxPf+GOIJYyniWjdqA6dUxgXkDk+d2lSI M4I96Gn2DyshAuqMx0HVIg54u7JrKcxBWm6XeIZDtenJZEDJvJVSQtU2cBDzKTLIIedKU0 7EnWbC7SSDVQ/cVT8ldZ2/n25R1cB2GdWdvg4V4NHWYYYNjaPbpvvjN3hScQuw== 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=1778616361; 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=blwc8RujlrkBb64onhTBsK43jQiaFjdUBlLYiJ85aWPTKot0vucIDx9AEYBhXzI4vJ/hgN R3HuqM0Oya0H805lRdd9ei9tUaT9dwsBgdO1P9hI0/lKPW2RZeeCmkoRRXdRDNmJ+qw2YR Mr9rvDcZfwAm2LdZ/uBNYmNNn3/kOhKwfqMqhU9IY7IF/vrBR7+YV3/mf4F1fPs/Dl+tCO Tj9tWRpfZlKDeYTHZAOg50vDrDFheHkghE9F/M9YtKuj9WNDCrzZG/4SEjGDVZpLtl5OA1 lxIitIzXnnJJEOBWj+2+sblk/dtzj8pPd6A++KeWgaYNErsfu+/Hcm6VfZhlNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJm6S2rz3ZJ for ; Tue, 12 May 2026 20:06:00 +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 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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);