From nobody Tue Nov 23 23:13:13 2021 X-Original-To: dev-commits-src-branches@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 408E218A25C2; Tue, 23 Nov 2021 23:13:18 +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 4HzKgc1C2qz3vjG; Tue, 23 Nov 2021 23:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B16831F0CD; Tue, 23 Nov 2021 23:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ANNDDJF038113; Tue, 23 Nov 2021 23:13:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNDDHk038112; Tue, 23 Nov 2021 23:13:13 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:13:13 GMT Message-Id: <202111232313.1ANNDDHk038112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: abb212fe13df - stable/13 - ktls tests: Check the return values of close(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: abb212fe13df3ed967e5aabc38c5e5f0fcf499a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709196; 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=m9dI/T3sRzHw8gNOCTJctPyWaAeLnTzQE8/JMhbNT/c=; b=QrfAoq5PARNYfAJZLqCxRFI4r+YE9JeFb07YhJdv6z3PjGO4lJOn5O8goNNiECqf1FCzm+ 32vdR2qegW4C0XIcO23Yj2sNgO6aavVYW4Z3K/CLfOA7vq1axga3fe7laSDtil2SpU6Hj1 XEZKN34tA7ezyztmKaqmH+9xFSiYvwxP1wx+ybBXm42mXrhvfyKhiqjRquQ9Cnw3JR0K8r HARLPD1v6d8Ysrds/IkNYLdg3gaXtBemKRywSouWfhmGBke28VZcqSeJLyeOaqiFkTQ9uO 3ubrdaXDwNfcn+kqlCE03CJjgQ5SE8YQru9ruAZDLNLt8YZ4G1YkF87rBSPuxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709196; a=rsa-sha256; cv=none; b=fg6IRWyDKCWQDqL6KyiyjZ01J89Dv2bqZY24I0a9FtnYA/YXnb3NbJdTEKGg9Ne3j22rwK MhPd+e+S/dkgVDvEGir61p/sT2jiUwqP1JFk/yQ40qNmVvSWmTuAyTNCKmD99o/Hk1oPlU +7wyl2Wwk0KioimkUBAQ1JP+4HOX2f7xF2NncYIKO3HNwRXVIxPDDadDMaPYVcCoc5VLt6 zLWCAwEZp8tFj8I/ne4FplkNONNO81qnRYJOVzslg2o5eo+Hf1YN9MAo1Mi4d0Wu8Ll7CL rUBBJgu77EHKtxOivSxpqJj1z7OGHFIS7TvCU+5ZoMQQTsbYylwYyAvsZWiAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=abb212fe13df3ed967e5aabc38c5e5f0fcf499a0 commit abb212fe13df3ed967e5aabc38c5e5f0fcf499a0 Author: John Baldwin AuthorDate: 2021-11-16 17:56:15 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:54 +0000 ktls tests: Check the return values of close(). Suggested by: markj Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D33004 (cherry picked from commit 694c708d6a0d00f84fa53357a1cc8a72272a26e3) --- tests/sys/kern/ktls_test.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index 64e26bb27f37..9942e78091b1 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -945,9 +945,9 @@ test_ktls_transmit_app_data(struct tls_enable *en, uint64_t seqno, size_t len) free(decrypted); free(plaintext); - close(sockets[1]); - close(sockets[0]); - close(kq); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); + ATF_REQUIRE(close(kq) == 0); } static void @@ -1031,8 +1031,8 @@ test_ktls_transmit_control(struct tls_enable *en, uint64_t seqno, uint8_t type, free(decrypted); free(plaintext); - close(sockets[1]); - close(sockets[0]); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); } static void @@ -1083,8 +1083,8 @@ test_ktls_transmit_empty_fragment(struct tls_enable *en, uint64_t seqno) free(outbuf); - close(sockets[1]); - close(sockets[0]); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); } static size_t @@ -1218,9 +1218,9 @@ test_ktls_receive_app_data(struct tls_enable *en, uint64_t seqno, size_t len) free(received); free(plaintext); - close(sockets[1]); - close(sockets[0]); - close(kq); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); + ATF_REQUIRE(close(kq) == 0); } #define TLS_10_TESTS(M) \ @@ -1474,8 +1474,8 @@ test_ktls_invalid_transmit_cipher_suite(struct tls_enable *en) sizeof(*en)) == -1); ATF_REQUIRE(errno == EINVAL); - close(sockets[1]); - close(sockets[0]); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); } #define GEN_INVALID_TRANSMIT_TEST(name, cipher_alg, key_size, auth_alg, \ @@ -1591,8 +1591,8 @@ test_ktls_invalid_receive_cipher_suite(struct tls_enable *en) */ ATF_REQUIRE(errno == EINVAL || errno == ENOTSUP); - close(sockets[1]); - close(sockets[0]); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); } #define GEN_INVALID_RECEIVE_TEST(name, cipher_alg, key_size, auth_alg, \ @@ -1631,8 +1631,8 @@ test_ktls_unsupported_receive_cipher_suite(struct tls_enable *en) sizeof(*en)) == -1); ATF_REQUIRE(errno == EPROTONOSUPPORT || errno == ENOTSUP); - close(sockets[1]); - close(sockets[0]); + ATF_REQUIRE(close(sockets[1]) == 0); + ATF_REQUIRE(close(sockets[0]) == 0); } #define GEN_UNSUPPORTED_RECEIVE_TEST(name, cipher_alg, key_size, \