From nobody Fri Jun 19 04:05:11 2026 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 4ghPBb5B3Vz6hPrd for ; Fri, 19 Jun 2026 04:05:11 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ghPBb2JBrz3XNg for ; Fri, 19 Jun 2026 04:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781841911; 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=w7LrrSvV5xP/pTpJfl4H5HcOaKdEMZxl/8gIuP6q8tI=; b=g3zGEK1DitJUiNzqmC6FkaG1G9g0tQ16J4nA+hL/YRe0f7g+N+gnn+6nCAN5VAsGF8qu8t O0Zca61WxucEV4kJDyL+6vXfbxbjrXajy5eF+1ajJCtiXu4lBrzWCU3EjU0RteJcDaLiQZ X3c3k17oTtYNBfHDAWXtLc5yDzqwwCYpE5FN1BjbFqA6FgBjZkeNlWfehq/0KTqa2wRjMH dnHMXsu+T13+AxL2zcyuy4bmZw5tpqf5ndcjsRCigOOIFYYn1yaQ3kmwz1DzooGVlz80Ap Nveef9iUSJe7ctpLYqUdgT0X7aZuv++hu3UQgRg/+4Qv6pyznWKl5PHezCKtRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781841911; a=rsa-sha256; cv=none; b=BSbxY0sbAOyN1GD3+CEPwFvIG1QabEYxrVj6qpNV2WrMYPB74nupU2FRyWfY4ZEqXltqxa m2mf0mJH5Yf0W5r+hR0ScBlr+sn6q3Wi+UU94EylJGEkFamXbsG8aGVeA/LbaZCxT4dQfG 0NMrvbLLo0YbwVySDbogH4sIbfTZTBZ2tNLHjgEa/lqfYmo92KIGJVyTYP6XdRLFEky++2 pd0DnWqicWK69UOmhnUDYYgLm2MY3+mG++nijHgSXCgROv52GFZx0h2zNJVb5butgMy9kw LguH45LAH9WUtvEKEjfuV8WWVKga7OJT32dOv5+0v/PkaDTf9a40tyV9pUvS9w== 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=1781841911; 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=w7LrrSvV5xP/pTpJfl4H5HcOaKdEMZxl/8gIuP6q8tI=; b=yqOV8BoyMESpbLb62XUsj2yMbJ+OP4BNQvUI3wm1HbmCu43vTAhJraQ1svDblmlBGsrv+o 8m54H3U/ORwbnreBPUrWh+pY6Tq2HC0kIfim2lRf8ggRUesnB2per13pKWvqx4WHR7IyvX qwbZfgqh/i7xjiM/HRt357J7ZX3sidKEXVsD9VuQUP731I/4bqjL6WXO2CMsXClUWJ9n/3 jA4ZZA8A7gMuJLLiHiDo/Vw/y58E8PS+J6ZUjISX2K7cow+Z1a2LD5uMyaAMAXnHFKhPmy FLU9dC527vxf6kXsJsj3VenRJ7x/ppsxizk/KdXuLb63WEDBA8/Pgdfq5CpI4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ghPBb11MSzD5p for ; Fri, 19 Jun 2026 04:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c472 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Jun 2026 04:05:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2f363febf8bf - main - tests: unix: pull a recvfd_payload_cmsg out of recvfd_payload 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f363febf8bf5c3e9ffad95b5998b461adc77c28 Auto-Submitted: auto-generated Date: Fri, 19 Jun 2026 04:05:11 +0000 Message-Id: <6a34bff7.1c472.d41582c@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f363febf8bf5c3e9ffad95b5998b461adc77c28 commit 2f363febf8bf5c3e9ffad95b5998b461adc77c28 Author: Kyle Evans AuthorDate: 2026-06-19 04:03:30 +0000 Commit: Kyle Evans CommitDate: 2026-06-19 04:03:30 +0000 tests: unix: pull a recvfd_payload_cmsg out of recvfd_payload This is almost a trivial factoring, but it's still a bit of boilerplate that we don't care to rewrite- the SO_PASSRIGHTS test will still receive some data, so the iovec construction still saves us a few lines. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57544 --- tests/sys/kern/unix_passfd_test.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 66bb406ea14e..2ad40582d058 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -208,13 +208,27 @@ localcreds(int sockfd) return (val != 0); } +static ssize_t +recvfd_payload_cmsg(int sockfd, void *buf, size_t buflen, struct msghdr *msghdr, + int recvmsg_flags) +{ + struct iovec iovec; + + iovec.iov_base = buf; + iovec.iov_len = buflen; + + msghdr->msg_iov = &iovec; + msghdr->msg_iovlen = 1; + + return (recvmsg(sockfd, msghdr, recvmsg_flags)); +} + static ssize_t recvfd_payload(int sockfd, int *recv_fd, void *buf, size_t buflen, size_t cmsgsz, int recvmsg_flags) { struct cmsghdr *cmsghdr; struct msghdr msghdr; - struct iovec iovec; char *message; ssize_t len; bool foundcreds; @@ -226,13 +240,7 @@ recvfd_payload(int sockfd, int *recv_fd, void *buf, size_t buflen, msghdr.msg_control = message; msghdr.msg_controllen = cmsgsz; - iovec.iov_base = buf; - iovec.iov_len = buflen; - - msghdr.msg_iov = &iovec; - msghdr.msg_iovlen = 1; - - len = recvmsg(sockfd, &msghdr, recvmsg_flags); + len = recvfd_payload_cmsg(sockfd, buf, buflen, &msghdr, recvmsg_flags); ATF_REQUIRE_MSG(len != -1, "recvmsg failed: %s", strerror(errno)); cmsghdr = CMSG_FIRSTHDR(&msghdr);