From nobody Tue Nov 17 17:06:21 2026 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 4jTWNG13thz71RsV for ; Tue, 17 Nov 2026 17:06:22 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWNF4qV9z4JmV for ; Tue, 17 Nov 2026 17:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935181; 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=hTtI0bfRumc10LR5qCRntsoHG51ao121RqnOE9Mpb9Q=; b=c0vSdNymRTBRXupvZIenhgWpplmG5KaWmrvEiO/JRx9/aHAJs/NWDn5vIF0d6EY7T9tiwK Gwx2zyNCSen5cTQOVTHyaYxU8ywm7gIz+Q48l1Qcoq63mCUub40sTCctvWVYzDSwmOwMHB 9RyELJP1OzqgygDC+d9dAKsbKK1qZFl7d8kUi22PjftZ/F5JWzSW0/vQ+MzSW7DiULVAIE HTwBVEo6zfiZmGkSCwjefiRDFfohYJy6ejGaXsuqGpTbddHizRn9aI2Euc217tBkMyre0I XUeY3wQNnCvI1Wn/5MaktagFaaxUO99iBJsl7pwALWvGatlwhMoNkRbXdx2paw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935181; b=Z2QMmpKSHtCdJR8/X88EStbdoqz/0Eyztnm87oDL9rVBEkqqZdW05QmgIyTmvQRh5MEXQK dybpLdqAhrakzqa1tqwBJdlS+CUOgP+XdH+eVHLEuHhmkvZmiXVkS+ErHV2OQCzlC5RM5m e2c+PTWrRVV9uD/38hmTx17Al2mqTTv55HocZ+2Q9wriasKH9DrBl0httjPNFq+WOQ2GKO pj2x8hgtzsa4g24IdHl1I0TqhMDq42bBZa3CCf7VOtXE1T9TN81yqb/6fU76L0LcKz/a/M NQX8azqM8Uthb3dSnnFHjDsh+eo9b3YGrLJYQnSdkUZKkxpdILQ4yDZ2fidOIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935181; 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=hTtI0bfRumc10LR5qCRntsoHG51ao121RqnOE9Mpb9Q=; b=MhsGRaWR2g2DoQU9EO+d/gSqQusC6pet9bIzFKnqzA2p8WT40UyduuUOpCX5ywKs6BBORD cAJG1+yyDnA90RIN/YAepi/UHVJTVt2+37lox/6Uz54lv+znDwuGJ/a+HKKXojtg/PFpNb Y8hNcOGvQmk/czVQAbal+HOAW0VKkeKQEESfPxSXQM+ftqF+a6M+J5roXa+aeP+MnHPeiX aH5Q8Vh8kEQhqDxZepW+mKTTRPrEDFEolaEeASplXoYFZU80Xu085a3Lblj0AEv2p3JXK5 M5YXtdpK3U8NBVmXRh9Gd84SxLp+SxABG4hCFTL/x6ykOA6ORKysK2DnSZ6bVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWNF4H5LzrvR for ; Tue, 17 Nov 2026 17:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb4482d1cc55 - stable/15 - tmpfs tests: Add regression tests for setgid handling List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eb4482d1cc556a11e40411bd078eee879ab88696 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:21 +0000 Message-Id: <6afc898d.1fc82.712fb1f5@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb4482d1cc556a11e40411bd078eee879ab88696 commit eb4482d1cc556a11e40411bd078eee879ab88696 Author: Mark Johnston AuthorDate: 2026-11-15 16:03:13 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:23 +0000 tmpfs tests: Add regression tests for setgid handling Approved by: so Security: FreeBSD-SA-26:94.tmpfs Sponsored by: The FreeBSD Foundation --- tests/sys/fs/tmpfs/Makefile | 3 + tests/sys/fs/tmpfs/setgid_test.c | 221 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) diff --git a/tests/sys/fs/tmpfs/Makefile b/tests/sys/fs/tmpfs/Makefile index ce4ca959838c..e8587f2c7b37 100644 --- a/tests/sys/fs/tmpfs/Makefile +++ b/tests/sys/fs/tmpfs/Makefile @@ -6,6 +6,9 @@ TESTSDIR= ${TESTSBASE}/sys/fs/${FILESYSTEM} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/fs/${FILESYSTEM} +ATF_TESTS_C+= setgid_test +LIBADD.setgid_test+= util + # XXX: uses /dev/MAKEDEV to create pseudo /dev/{null,zero} character devices #NETBSD_ATF_TESTS_SH+= devices_test NETBSD_ATF_TESTS_SH+= create_test diff --git a/tests/sys/fs/tmpfs/setgid_test.c b/tests/sys/fs/tmpfs/setgid_test.c new file mode 100644 index 000000000000..f9425e423573 --- /dev/null +++ b/tests/sys/fs/tmpfs/setgid_test.c @@ -0,0 +1,221 @@ +/* + * Copyright (c) 2026 Mark Johnston + * + * This software was written by Mark Johnston under sponsorship from + * the FreeBSD Foundation. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DIR_GID 54320 /* group owning the test directory */ +#define TEST_UID 54321 +#define TEST_GID 54322 + +#define TESTDIR "mnt/dir" +#define TESTPATH TESTDIR "/node" + +enum nodetype { + NODE_FILE, + NODE_FIFO, +}; + +/* + * Mount tmpfs and make a world-writeable directory. + */ +static void +mount_tmpfs(void) +{ + struct iovec *iov; + char errmsg[256]; + int error, iovlen; + + iov = NULL; + iovlen = 0; + + ATF_REQUIRE(mkdir("mnt", 0755) == 0); + build_iovec(&iov, &iovlen, "fstype", __DECONST(char *, "tmpfs"), + (size_t)-1); + build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, "mnt"), + (size_t)-1); + build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); + errmsg[0] = '\0'; + error = nmount(iov, iovlen, 0); + ATF_REQUIRE_MSG(error == 0, "nmount: %s", + errmsg[0] != '\0' ? errmsg : strerror(errno)); + free_iovec(&iov, &iovlen); + + ATF_REQUIRE(mkdir("mnt/dir", 0777) == 0); + ATF_REQUIRE(chown("mnt/dir", 0, DIR_GID) == 0); + ATF_REQUIRE(chmod("mnt/dir", 0777) == 0); +} + +static void +unmount_tmpfs(void) +{ + int error; + + error = unmount("mnt", MNT_FORCE); + if (error != 0) + warn("unmount"); +} + +/* + * Try to create a setgid file, and return true if the setgid bit was applied. + */ +static bool +create_setgid(enum nodetype type, uid_t uid, gid_t gid, const gid_t *groups, + int ngroups) +{ + struct stat sb; + pid_t pid; + int fd, status; + + pid = fork(); + ATF_REQUIRE(pid != -1); + if (pid == 0) { + if (setgroups(ngroups, groups) != 0 || + setgid(gid) != 0 || + setuid(uid) != 0) + _exit(errno); + (void)umask(0); + switch (type) { + case NODE_FILE: + fd = open("mnt/dir/a", O_WRONLY | O_CREAT | O_EXCL, + 02755); + if (fd < 0) + _exit(errno); + (void)close(fd); + break; + case NODE_FIFO: + if (mkfifo("mnt/dir/a", 02644) != 0) + _exit(errno); + break; + } + _exit(0); + } + ATF_REQUIRE(waitpid(pid, &status, 0) == pid); + ATF_REQUIRE_MSG(WIFEXITED(status), "status %#x", status); + ATF_REQUIRE_MSG(WEXITSTATUS(status) == 0, "child failed: %d", + WEXITSTATUS(status)); + + ATF_REQUIRE(stat("mnt/dir/a", &sb) == 0); + ATF_REQUIRE_EQ(uid, sb.st_uid); + ATF_REQUIRE_EQ(DIR_GID, sb.st_gid); + return ((sb.st_mode & S_ISGID) != 0); +} + +ATF_TC_WITH_CLEANUP(nonmember_file); +ATF_TC_HEAD(nonmember_file, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(nonmember_file, tc) +{ + const gid_t groups[] = { TEST_GID }; + + mount_tmpfs(); + ATF_REQUIRE_MSG(!create_setgid(NODE_FILE, TEST_UID, TEST_GID, groups, + nitems(groups)), "S_ISGID was not cleared"); +} +ATF_TC_CLEANUP(nonmember_file, tc) +{ + unmount_tmpfs(); +} + +ATF_TC_WITH_CLEANUP(nonmember_fifo); +ATF_TC_HEAD(nonmember_fifo, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(nonmember_fifo, tc) +{ + const gid_t groups[] = { TEST_GID }; + + mount_tmpfs(); + ATF_REQUIRE_MSG(!create_setgid(NODE_FIFO, TEST_UID, TEST_GID, groups, + nitems(groups)), "S_ISGID was not cleared"); +} +ATF_TC_CLEANUP(nonmember_fifo, tc) +{ + unmount_tmpfs(); +} + +ATF_TC_WITH_CLEANUP(member_file); +ATF_TC_HEAD(member_file, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(member_file, tc) +{ + const gid_t groups[] = { DIR_GID }; + + mount_tmpfs(); + ATF_REQUIRE_MSG(create_setgid(NODE_FILE, TEST_UID, DIR_GID, groups, + nitems(groups)), "S_ISGID was cleared"); +} +ATF_TC_CLEANUP(member_file, tc) +{ + unmount_tmpfs(); +} + +ATF_TC_WITH_CLEANUP(supplementary_member_file); +ATF_TC_HEAD(supplementary_member_file, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(supplementary_member_file, tc) +{ + const gid_t groups[] = { DIR_GID }; + + mount_tmpfs(); + ATF_REQUIRE_MSG(create_setgid(NODE_FILE, TEST_UID, TEST_GID, groups, + nitems(groups)), "S_ISGID was cleared"); +} +ATF_TC_CLEANUP(supplementary_member_file, tc) +{ + unmount_tmpfs(); +} + +ATF_TC_WITH_CLEANUP(privileged_file); +ATF_TC_HEAD(privileged_file, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(privileged_file, tc) +{ + const gid_t groups[] = { TEST_GID }; + + mount_tmpfs(); + ATF_REQUIRE_MSG(create_setgid(NODE_FILE, 0, TEST_GID, groups, + nitems(groups)), "S_ISGID was cleared"); +} +ATF_TC_CLEANUP(privileged_file, tc) +{ + unmount_tmpfs(); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, nonmember_file); + ATF_TP_ADD_TC(tp, nonmember_fifo); + ATF_TP_ADD_TC(tp, member_file); + ATF_TP_ADD_TC(tp, supplementary_member_file); + ATF_TP_ADD_TC(tp, privileged_file); + return (atf_no_error()); +}