Date: Fri, 31 Dec 2021 14:26:19 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5a3abce55e16 - stable/13 - ktls: Add a regression test to exercise socket error handling Message-ID: <202112311426.1BVEQJIi040802@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a3abce55e16e43adc1db506bf47ba1aca59b82c commit 5a3abce55e16e43adc1db506bf47ba1aca59b82c Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-12-17 16:00:19 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-12-31 14:25:45 +0000 ktls: Add a regression test to exercise socket error handling Prior to commit 916c61a5ed37 ("Fix handling of errors from pru_send(PRUS_NOTREADY)") this test triggered a kernel panic due to an mbuf double free. Reviewed by: jhb Sponsored by: The FreeBSD Foundation (cherry picked from commit ee5686c614ba7e11e8586b2e5b02dfc550679e96) --- tests/sys/kern/ktls_test.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index 9942e78091b1..b2c722914854 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -1662,6 +1662,45 @@ ATF_TC_BODY(ktls_receive_unsupported_##name, tc) \ AES_CBC_TESTS(GEN_UNSUPPORTED_RECEIVE_TEST); TLS_13_TESTS(GEN_UNSUPPORTED_RECEIVE_TEST); +/* + * Try to perform an invalid sendto(2) on a TXTLS-enabled socket, to exercise + * KTLS error handling in the socket layer. + */ +ATF_TC_WITHOUT_HEAD(ktls_sendto_baddst); +ATF_TC_BODY(ktls_sendto_baddst, tc) +{ + char buf[32]; + struct sockaddr_in dst; + struct tls_enable en; + ssize_t n; + int s; + + ATF_REQUIRE_KTLS(); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ATF_REQUIRE(s >= 0); + + build_tls_enable(CRYPTO_AES_NIST_GCM_16, 128 / 8, 0, + TLS_MINOR_VER_THREE, (uint64_t)random(), &en); + + ATF_REQUIRE(setsockopt(s, IPPROTO_TCP, TCP_TXTLS_ENABLE, &en, + sizeof(en)) == 0); + + memset(&dst, 0, sizeof(dst)); + dst.sin_family = AF_INET; + dst.sin_len = sizeof(dst); + dst.sin_addr.s_addr = htonl(INADDR_BROADCAST); + dst.sin_port = htons(12345); + + memset(buf, 0, sizeof(buf)); + n = sendto(s, buf, sizeof(buf), 0, (struct sockaddr *)&dst, + sizeof(dst)); + + /* Can't transmit to the broadcast address over TCP. */ + ATF_REQUIRE_ERRNO(EACCES, n == -1); + ATF_REQUIRE(close(s) == 0); +} + ATF_TP_ADD_TCS(tp) { /* Transmit tests */ @@ -1678,5 +1717,8 @@ ATF_TP_ADD_TCS(tp) TLS_13_TESTS(ADD_UNSUPPORTED_RECEIVE_TEST); INVALID_CIPHER_SUITES(ADD_INVALID_RECEIVE_TEST); + /* Miscellaneous */ + ATF_TP_ADD_TC(tp, ktls_sendto_baddst); + return (atf_no_error()); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112311426.1BVEQJIi040802>