git: 32135d5a66e3 - releng/15.2 - vfs: Check access for O_CREAT directory opens
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 17:09:59 UTC
The branch releng/15.2 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=32135d5a66e3cc1d1e8f19f648b92f3228ebd9de
commit 32135d5a66e3cc1d1e8f19f648b92f3228ebd9de
Author: Kevin Day <kevin@your.org>
AuthorDate: 2026-11-13 19:49:13 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-17 13:37:06 +0000
vfs: Check access for O_CREAT directory opens
O_CREAT with O_DIRECTORY takes LOOKUP without creating a vnode.
Clear O_CREAT there so vn_open_vnode checks read or search access.
Add an unprivileged regression test for denied and permitted opens.
Approved by: re (cperciva)
Approved by: so
Security: FreeBSD-SA-26:92.vfs
Security: CVE-2026-127746
Reviewed by: kib
Fixes: 9e18c9eb27cd
---
sys/kern/vfs_vnops.c | 1 +
tests/sys/file/fcntlflags_test.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index defede5e0cab..52e3b17c49db 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -403,6 +403,7 @@ restart:
fmode &= ~O_CREAT;
}
} else {
+ fmode &= ~O_CREAT;
ndp->ni_cnd.cn_nameiop = LOOKUP;
ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags,
ndp->ni_cnd.cn_flags);
diff --git a/tests/sys/file/fcntlflags_test.c b/tests/sys/file/fcntlflags_test.c
index 15a18c113c4a..15bf460a5887 100644
--- a/tests/sys/file/fcntlflags_test.c
+++ b/tests/sys/file/fcntlflags_test.c
@@ -25,6 +25,7 @@
*/
#include <sys/filio.h>
+#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@@ -96,6 +97,37 @@ ATF_TC_BODY(exec_only_sh, tc)
basic_tests("/bin/sh", O_EXEC, "O_EXEC");
}
+ATF_TC_WITH_CLEANUP(creat_directory_permissions);
+ATF_TC_HEAD(creat_directory_permissions, tc)
+{
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(creat_directory_permissions, tc)
+{
+ const char *dir = "creat_directory_permissions";
+ int fd;
+
+ ATF_REQUIRE(mkdir(dir, 0700) == 0);
+ ATF_REQUIRE(chmod(dir, 0300) == 0);
+ ATF_REQUIRE_ERRNO(EACCES,
+ open(dir, O_RDONLY | O_CREAT | O_DIRECTORY, 0) == -1);
+ fd = open(dir, O_SEARCH | O_CREAT | O_DIRECTORY, 0);
+ ATF_REQUIRE(fd >= 0);
+ ATF_REQUIRE(close(fd) == 0);
+
+ ATF_REQUIRE(chmod(dir, 0400) == 0);
+ ATF_REQUIRE_ERRNO(EACCES,
+ open(dir, O_SEARCH | O_CREAT | O_DIRECTORY, 0) == -1);
+ fd = open(dir, O_RDONLY | O_CREAT | O_DIRECTORY, 0);
+ ATF_REQUIRE(fd >= 0);
+ ATF_REQUIRE(close(fd) == 0);
+}
+ATF_TC_CLEANUP(creat_directory_permissions, tc)
+{
+ (void)chmod("creat_directory_permissions", 0700);
+ (void)rmdir("creat_directory_permissions");
+}
+
ATF_TC_WITHOUT_HEAD(fioasync_dev_null);
ATF_TC_BODY(fioasync_dev_null, tc)
{
@@ -127,6 +159,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, write_only_null);
ATF_TP_ADD_TC(tp, read_write_null);
ATF_TP_ADD_TC(tp, exec_only_sh);
+ ATF_TP_ADD_TC(tp, creat_directory_permissions);
ATF_TP_ADD_TC(tp, fioasync_dev_null);
return (atf_no_error());