From nobody Tue Oct 24 13:38:22 2023 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 4SFCnC72RBz4y3vs; Tue, 24 Oct 2023 13:38:23 +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 4SFCnB5cJTz4YyH; Tue, 24 Oct 2023 13:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154702; 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=CMm/U0yz4ALoUfw8omkKQAdMawvO8RMEssCxZRL9oMU=; b=X8BUb2AEzXA0qc1eH2axbJxPl9tjZG8j56d9JXEnYFIVeQ5+koyFyd5XRRNqioXL/craZ0 bJzPaUdBiwDEnR8XLqoVlUcK0FN6SES0lcDZDCp+5FZZsEbStAfPA7bgP28+uISh4LxeSu iim4N3hKvS6SYJvH4Kh6XlIDrVcm861Gq1AktXJUwgyx4/9sf/hWk7RyqHYjSW2z/wHAJ+ l7EQm+i0PUIaQq9rVSAJZLfB9hmVXTjXOoqUM9i3iqm5SoWU4WknVkAeaZxFYnk7g/w8N0 NT7/7Q6drVXH2dg/u6/dgkfAVLKEIK/lNQKjTjoqQnC3j9CNA2v8wcPTVtYumA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154702; a=rsa-sha256; cv=none; b=hZrWn/b4JGUuzOjLgeMr7oVsoA1EAocbOb5E0mkKizR6uOu8XQwPCyCZq0mLa5miN0Ag+J dWNbqmO4OAH/woc0Y1lQrHlI63uZmDUbMKsQPNxPan82rpQ5WjBucWWhamMxiWZa90/Nnd Es+oIKB3uO6TtwSG7X/7lwF8DPgcvlqwrJMSK3KeCK6hpoJgdKy4lT2JHKzEQCPYchbvWC 3a8BuiLmS65aLvBjVyU+cH6/4BlWXqJMIt6KrbtA7u/8k7sEFLU+6PZOXKDvPzrqv6LYSp 1H4dQlriqSIEWr+HuAJ76zAXXyr5E085SKGopn9bFZf65k1vRG3YYFbfmmFx0A== 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=1698154702; 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=CMm/U0yz4ALoUfw8omkKQAdMawvO8RMEssCxZRL9oMU=; b=MFinDdvdGwkHOgRpn8xH7p0VDTiiGGM2a24kraWIC3XxkQ9OaV6bBZRgat+1xEMs/8NVMb NhtSj2lkV2bXeMeLWjlO5I2oKUFO/t9w7RWxusmDqYduHzE40HvKrWGrmK2JjweUdblk/S 6GHRZN2G8T+ZxfTHjHguBBg9m+NsGV0TXKV2YfLmumgUjNAfcaDbJ/oDs9qa1K9alD5HDZ GJeLIsvnMBNFdEvgTOWCnwGqKZIeDfC9mgjc1zVu9sGN1IPJ0owDjSBg8v/EI8XfX2kL73 hIV8ywtEqebtc7sY5GXmZH5Ko+rYbrJRi/jlS6zBqK0iCS1xCWHnM4pGs1Ld5Q== 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 4SFCnB4k7Zz9P6; Tue, 24 Oct 2023 13:38:22 +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 39ODcM88089286; Tue, 24 Oct 2023 13:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcMLu089283; Tue, 24 Oct 2023 13:38:22 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:22 GMT Message-Id: <202310241338.39ODcMLu089283@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: f79b01d323c0 - stable/14 - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f79b01d323c04e5530956ee071faff7b2ec5ec33 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f79b01d323c04e5530956ee071faff7b2ec5ec33 commit f79b01d323c04e5530956ee071faff7b2ec5ec33 Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:39 +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()); }