From nobody Thu May 29 18:45:26 2025 X-Original-To: dev-commits-src-main@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 4b7b0Q3nQmz5xMHk; Thu, 29 May 2025 18:45:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0Q26Brz3PnT; Thu, 29 May 2025 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544326; 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=LLGMrMkglbokwqAWw5Wsn+VARBWN/mDOXeB90HMPJOw=; b=EJsvQUA60HnXdIUsOLgZIAyAlXorRY4lnVpYWJcl/vPpa9Ry/x1so8sYu1enbN2Ek4F/iS bQKH+IyoMH0nFjukd428YrLM+mVgAG6jyDu0vhVoLQ2EYwVLXo9hS3eAJWf8NhblRZy6iJ oNPMIP5UyWJnwN4kpEebdyPwZS4kfsT4bFjVqEkmyJDmt3AxISnVJggyOx9e0o6PPcKbKW GsVr9EICo9dQpG50cOON4ONZwGDAr7qr0klufU8pmfd75Q+02G3Nqzdak+nxSJumoBcnHa GuLLlJv9imiHG/b+SxC6nL6p4qqhJIi7GwuGaOMNXkcVTRocTY/+ghRSByYIvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544326; a=rsa-sha256; cv=none; b=aMmR3EA4cxVBOIc+n9OhGx1p1do0tNOxU0yO0bQPDJhSNnjElP0NpVMSnVDQdA2GBbjoSQ kulb6ggqieEVyNaMF/Lgi1b2sgmKXcKWm++5KEgPpMtihCCNCoXl5d7k6INODp45yNGDNB GCCbyoRuoVFJ5z04wxPJ0gO74hjAuXelN4wimLvzg4PFd7LZxRlQ7pNimJG9lO/lhoHm29 ozWbt3MHovkuBpx6BQylee3+Z+N+CaAvCEbZzPzK4IyU0/7aCUhoYi/Skj6/hEHUJIWlDl UyG+s7TmUrC6KjS+TE1hGhJBcaDSBJcKeZVE4U1vk15UgWMLMKkT+ORxxJClKA== 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=1748544326; 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=LLGMrMkglbokwqAWw5Wsn+VARBWN/mDOXeB90HMPJOw=; b=r05wjYVipaxxisOwl5NlqwpeH0kdL+2FJbsf7RzGjv0WprEXRDvc0VcDLay+gG9MfPSYeO R6dBJTX0F2VyOB3br4Ck5UT3+meOpXieAicyn3Bkqyrh2nRO+WVKx+Obvz/g2xnr0CDoHK TMqImP70kbVuXnB8IiBDW0zfFHO8wPmM8v0Til9Bbay3nonqJsJhVNkBeagDCh4NItbvPu 99O7rpzdnf743RCEWbVBqGbUDDpCn9IB9JBrT6bSWtkQC2TYLgbBa+/0IW+S7HtXz0Yq+G W3WrLoEtHjTxDql1pnYfHhsl8ZBekX5Av8Z71TfxxkMkDfveuqfo92eMN91QNA== 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 4b7b0Q1k6Lz3yq; Thu, 29 May 2025 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54TIjQUr099354; Thu, 29 May 2025 18:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjQCM099351; Thu, 29 May 2025 18:45:26 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:26 GMT Message-Id: <202505291845.54TIjQCM099351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3267e0815e06 - main - tests/unix: test MSG_PEEK read from a socket that has a descriptor List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3267e0815e0624d6971483b2bd9f3be175771deb Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3267e0815e0624d6971483b2bd9f3be175771deb commit 3267e0815e0624d6971483b2bd9f3be175771deb Author: Gleb Smirnoff AuthorDate: 2025-05-28 19:48:35 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 tests/unix: test MSG_PEEK read from a socket that has a descriptor --- tests/sys/kern/unix_passfd_test.c | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 74095859d899..8c6a976a0e12 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -544,6 +544,51 @@ ATF_TC_BODY(send_overflow, tc) closesocketpair(fd); } +/* + * Make sure that we do not receive descriptors with MSG_PEEK. + */ +ATF_TC_WITHOUT_HEAD(peek); +ATF_TC_BODY(peek, tc) +{ + int fd[2], getfd, putfd, nfds; + + domainsocketpair(fd); + tempfile(&putfd); + nfds = getnfds(); + sendfd(fd[0], putfd); + ATF_REQUIRE(getnfds() == nfds); + + /* First make MSG_PEEK recvmsg(2)... */ + char cbuf[CMSG_SPACE(sizeof(int))]; + char buf[1]; + struct iovec iov = { + .iov_base = buf, + .iov_len = sizeof(buf) + }; + struct msghdr msghdr = { + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = cbuf, + .msg_controllen = sizeof(cbuf), + }; + ATF_REQUIRE(1 == recvmsg(fd[1], &msghdr, MSG_PEEK)); + for (struct cmsghdr *cmsghdr = CMSG_FIRSTHDR(&msghdr); + cmsghdr != NULL; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) { + /* Usually this is some garbage. */ + printf("level %d type %d len %u\n", + cmsghdr->cmsg_level, cmsghdr->cmsg_type, cmsghdr->cmsg_len); + } + + /* ... and make sure we did not receive any descriptors! */ + ATF_REQUIRE(getnfds() == nfds); + + /* Now really receive a descriptor. */ + recvfd(fd[1], &getfd, 0); + ATF_REQUIRE(getnfds() == nfds + 1); + close(putfd); + close(getfd); + closesocketpair(fd); +} /* * Send two files. Then receive them. Make sure they are returned in the @@ -997,6 +1042,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, send_and_shutdown); ATF_TP_ADD_TC(tp, send_a_lot); ATF_TP_ADD_TC(tp, send_overflow); + ATF_TP_ADD_TC(tp, peek); ATF_TP_ADD_TC(tp, two_files); ATF_TP_ADD_TC(tp, bundle); ATF_TP_ADD_TC(tp, bundle_cancel);