From nobody Tue Oct 24 13:38:06 2023 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 4SFCmt5YDtz4y3gj; Tue, 24 Oct 2023 13:38:06 +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 4SFCmt4p5Dz4Y3N; Tue, 24 Oct 2023 13:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154686; 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=bvSGlDmFN/EN0G2jjOxZQTF7I65W9KPvTd739g6V4VM=; b=Ye7jfo172lwZr+iIHcmZuBuRkfHupFiSTnNnTAkgRBBOCbifNprGdZ0PIt8I/+DMxsQKi3 dI+0Cz17UcK1LqJuuO23PEEmgxkkBb6lNBYyeRWW6pUQsCNoYPvA5q45QKaVZqgtLoVEmN 8BbnsgjDjv0zJPX2NiIKFJq5ICKo5MUTglIQ6NZpAMaCfW+WafP2umWG258wcSCdFfq8eo c6/YN3oikVyzXRl4gXJNFyeeIXBYJT5NxlmqtT/CC92FruLMjKO98B0U5eoNC6eUKdAF48 5VsXsi+lWLh0W81ojN5gOVufHmGdDbOV3kjshkwBtgHskz5oAvG59c57iAhJpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154686; a=rsa-sha256; cv=none; b=fu9k6eo1wowZDHyS1e+GXdi8z2Fm9TpPJw+iAxG98PXEDzBhLsttt7t6gHpu0jZgFTur7Z 3k6iMoTELq9JTcdhqON5NqD4AXhCYhlm+POwV81euz5fiAnb8CNQiw1eh/rkJUqfwzMPOx K1liTLEOd6JboLpjbgumqH7BCeEbV9bdqprDIsZMkbcIl24xS9TbgDy6KH1KHgx8Snh2oU O6DL1aWI1nNpD3yusuWFMDWTn7Dae1O8Ar8LV65IQmRCg5MMMJwyynKtZeTMPIheljPkKs 5gJUFfFItmOpVk9mHG3I8jan5ibW7tFvvhp0p52YQTs5Gqlxv78BXI7rXcEhhw== 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=1698154686; 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=bvSGlDmFN/EN0G2jjOxZQTF7I65W9KPvTd739g6V4VM=; b=jHKeFQHHLtwfXglpego8EZiRJxks0q1DdQ9D3wpU6RVpr8KiSmkO58iQH8Dn3O+VtCPj+V 7FqWNzI8MYnRhlOn2MhOmBkbpFfkJdHO2hArdjT2lx9p6tkWZFF+8FF8nQw0Yi82xe1wbr C89y0xmICDhOcRTOItV+fjycYXQUxHfdBE3kNN1omunPOmwZVb0phX/WfmOk6xRj9lezhm 3qfj9H8wY38tvK2OvWOnV4hkcGqhPRIEd3Q1glA2V9a6/0bRcoHfFnlhC90ZbObvBGij0s qrodGNDQ5f9FUHTe42c1n59Y6DZ3+rcjI7X6t2K5Xbt/i2dlXh92dahSY7CDeg== 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 4SFCmt3vxFz9Sr; Tue, 24 Oct 2023 13:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39ODc6nl088743; Tue, 24 Oct 2023 13:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc60X088740; Tue, 24 Oct 2023 13:38:06 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:06 GMT Message-Id: <202310241338.39ODc60X088740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f5a9a849e903 - stable/13 - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f5a9a849e9034c597c2b0a9014673a44834b9516 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a9a849e9034c597c2b0a9014673a44834b9516 commit f5a9a849e9034c597c2b0a9014673a44834b9516 Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:43 +0000 socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) MFC after: 1 week (cherry picked from commit d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e) --- tests/sys/kern/socket_msg_trunc.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 469b9e1503cd..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,11 +27,13 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -182,12 +184,67 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } +/* + * Exercise the case where ktrace was used to dump a truncated buffer. + */ +ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); +ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) +{ + struct ktr_header ktr; + struct msghdr msg; + struct iovec iov; + const char *tracepath; + char buf[128]; + ssize_t nbytes; + int error, fd, sd[2]; + + tracepath = "ktrace"; + + error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); + ATF_REQUIRE(error == 0); + + memset(buf, 0, sizeof(buf)); + nbytes = send(sd[0], buf, sizeof(buf), 0); + ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + + fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); + ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); + error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(SET) failed: %s", strerror(errno)); + + iov.iov_base = buf; + iov.iov_len = sizeof(buf) - 1; /* truncate */ + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); + ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); + + error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(CLEARFILE) failed: %s", strerror(errno)); + + nbytes = read(fd, &ktr, sizeof(ktr)); + ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + + ATF_REQUIRE(close(fd) == 0); + ATF_REQUIRE(close(sd[0]) == 0); + ATF_REQUIRE(close(sd[1]) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); + ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); }