Date: Fri, 20 Oct 2023 14:07:16 GMT 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: 6ad6929974e6 - main - netinet tests: Fix leaks in ip6_v4mapped_test Message-ID: <202310201407.39KE7Gcf039320@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ad6929974e6394d57a40f7d43c899963c6ae5ec commit 6ad6929974e6394d57a40f7d43c899963c6ae5ec Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-10-20 14:05:58 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-10-20 14:05:58 +0000 netinet tests: Fix leaks in ip6_v4mapped_test Reported by: Coverity MFC after: 1 week --- tests/sys/netinet/ip6_v4mapped_test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/ip6_v4mapped_test.c b/tests/sys/netinet/ip6_v4mapped_test.c index d4c4ed526ab5..bbc8d11d63ef 100644 --- a/tests/sys/netinet/ip6_v4mapped_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -294,8 +294,7 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) error = connect(csock, &su_mapped.saddr, su_mapped.saddr.sa_len); if (error != 0 && errno == EADDRINUSE) { /* This is the specific error we were looking for. */ - ATF_REQUIRE_MSG(error == 0, - "client connect %d failed, " + atf_tc_fail("client connect %d failed, " " client had duplicate port: %s", i, strerror(errno)); } @@ -312,6 +311,8 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) } ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); + + ATF_REQUIRE(close(lsock) == 0); } ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) { @@ -365,6 +366,7 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); memcpy(&sin6, aip->ai_addr, sizeof(sin6)); sin6.sin6_port = port; + freeaddrinfo(aip); ch = 0x42; n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); @@ -383,6 +385,9 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) n = recv(ls, &ch, 1, 0); ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); ATF_REQUIRE(ch == 0x42); + + ATF_REQUIRE(close(s) == 0); + ATF_REQUIRE(close(ls) == 0); } ATF_TP_ADD_TCS(tp)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310201407.39KE7Gcf039320>