Date: Tue, 12 May 2026 20:05:55 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 26bffe5695d7 - main - tests/tcp_hpts_test: Fix more resource leaks Message-ID: <6a038823.22d84.f4d7a67@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26bffe5695d7cab2e797ce4ad153f324c0262f48 commit 26bffe5695d7cab2e797ce4ad153f324c0262f48 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-05-12 17:44:31 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <nickbanks@netflix.com>, 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);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a038823.22d84.f4d7a67>