[libc-commits] [libc] [libc] Implement faccessat (PR #161065)
Marcell Leleszi via libc-commits
libc-commits at lists.llvm.org
Tue Sep 30 11:11:28 PDT 2025
https://github.com/mleleszi updated https://github.com/llvm/llvm-project/pull/161065
>From 5522dcc43476bf7dde20b3af64e16a1075a6c700 Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Sat, 27 Sep 2025 21:17:04 +0000
Subject: [PATCH 1/6] Implement faccessat
---
libc/config/linux/aarch64/entrypoints.txt | 1 +
libc/config/linux/x86_64/entrypoints.txt | 1 +
.../llvm-libc-macros/linux/fcntl-macros.h | 3 +
libc/include/unistd.yaml | 9 +
libc/src/unistd/CMakeLists.txt | 7 +
libc/src/unistd/faccessat.h | 21 +++
libc/src/unistd/linux/CMakeLists.txt | 14 ++
libc/src/unistd/linux/faccessat.cpp | 35 ++++
libc/test/src/unistd/CMakeLists.txt | 22 +++
libc/test/src/unistd/faccessat_test.cpp | 159 ++++++++++++++++++
10 files changed, 272 insertions(+)
create mode 100644 libc/src/unistd/faccessat.h
create mode 100644 libc/src/unistd/linux/faccessat.cpp
create mode 100644 libc/test/src/unistd/faccessat_test.cpp
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index ae8deabc97407..cfb77911f3c2d 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -325,6 +325,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.dup2
libc.src.unistd.dup3
libc.src.unistd.execve
+ libc.src.unistd.faccessat
libc.src.unistd.fchdir
libc.src.unistd.fpathconf
libc.src.unistd.fsync
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index bf2ad4a40ca11..87b78a337b875 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -331,6 +331,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.dup2
libc.src.unistd.dup3
libc.src.unistd.execve
+ libc.src.unistd.faccessat
libc.src.unistd.fchdir
libc.src.unistd.fpathconf
libc.src.unistd.fsync
diff --git a/libc/include/llvm-libc-macros/linux/fcntl-macros.h b/libc/include/llvm-libc-macros/linux/fcntl-macros.h
index aec8a0d2da0b5..632bcbe9d0716 100644
--- a/libc/include/llvm-libc-macros/linux/fcntl-macros.h
+++ b/libc/include/llvm-libc-macros/linux/fcntl-macros.h
@@ -61,6 +61,9 @@
// Allow empty relative pathname.
#define AT_EMPTY_PATH 0x1000
+// Perform access checks using the effective user and group IDs.
+#define AT_EACCESS
+
// Values of SYS_fcntl commands.
#define F_DUPFD 0
#define F_GETFD 1
diff --git a/libc/include/unistd.yaml b/libc/include/unistd.yaml
index 3ba3ec71c25ce..2ff86eafaf550 100644
--- a/libc/include/unistd.yaml
+++ b/libc/include/unistd.yaml
@@ -96,6 +96,15 @@ functions:
- type: const char *
- type: __exec_argv_t
- type: __exec_envp_t
+ - name: faccessat
+ standards:
+ - POSIX
+ return_type: int
+ arguments:
+ - type: int
+ - type: const char *
+ - type: int
+ - type: int
- name: fchdir
standards:
- POSIX
diff --git a/libc/src/unistd/CMakeLists.txt b/libc/src/unistd/CMakeLists.txt
index c66a3a4d0ed76..78c3bf8442fab 100644
--- a/libc/src/unistd/CMakeLists.txt
+++ b/libc/src/unistd/CMakeLists.txt
@@ -55,6 +55,13 @@ add_entrypoint_object(
.${LIBC_TARGET_OS}.dup3
)
+add_entrypoint_object(
+ faccessat
+ ALIAS
+ DEPENDS
+ .${LIBC_TARGET_OS}.faccessat
+)
+
add_entrypoint_object(
fchdir
ALIAS
diff --git a/libc/src/unistd/faccessat.h b/libc/src/unistd/faccessat.h
new file mode 100644
index 0000000000000..e6c7244a8f783
--- /dev/null
+++ b/libc/src/unistd/faccessat.h
@@ -0,0 +1,21 @@
+//===-- Implementation header for faccessat ------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_UNISTD_FACCESSAT_H
+#define LLVM_LIBC_SRC_UNISTD_FACCESSAT_H
+
+
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+int faccessat(int fd, const char *path, int amode, int flag);
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC_UNISTD_FACCESSAT_H
diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
index 2d510f32d287d..0b67417475b71 100644
--- a/libc/src/unistd/linux/CMakeLists.txt
+++ b/libc/src/unistd/linux/CMakeLists.txt
@@ -80,6 +80,20 @@ add_entrypoint_object(
libc.src.errno.errno
)
+add_entrypoint_object(
+ faccessat
+ SRCS
+ faccessat.cpp
+ HDRS
+ ../faccessat.h
+ DEPENDS
+ libc.hdr.fcntl_macros
+ libc.include.unistd
+ libc.include.sys_syscall
+ libc.src.__support.OSUtil.osutil
+ libc.src.errno.errno
+)
+
add_entrypoint_object(
fchdir
SRCS
diff --git a/libc/src/unistd/linux/faccessat.cpp b/libc/src/unistd/linux/faccessat.cpp
new file mode 100644
index 0000000000000..6908fbd75398e
--- /dev/null
+++ b/libc/src/unistd/linux/faccessat.cpp
@@ -0,0 +1,35 @@
+//===-- Linux implementation of faccessat ------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/unistd/faccessat.h"
+
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+#include "src/__support/common.h"
+
+#include "hdr/fcntl_macros.h"
+#include "src/__support/libc_errno.h"
+#include "src/__support/macros/config.h"
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+
+LLVM_LIBC_FUNCTION(int, faccessat, (int fd, const char *path, int amode, int flag)) {
+#ifdef SYS_faccessat2
+ int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_faccessat2, fd, path, amode, flag);
+#else
+#error "faccessat2 syscall is not available."
+#endif
+
+ if (ret < 0) {
+ libc_errno = -ret;
+ return -1;
+ }
+ return 0;
+}
+
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/unistd/CMakeLists.txt b/libc/test/src/unistd/CMakeLists.txt
index 6630a7ef15e53..e03e4be7b0936 100644
--- a/libc/test/src/unistd/CMakeLists.txt
+++ b/libc/test/src/unistd/CMakeLists.txt
@@ -93,6 +93,28 @@ add_libc_unittest(
libc.test.UnitTest.ErrnoSetterMatcher
)
+add_libc_unittest(
+ faccessat_test
+ SUITE
+ libc_unistd_unittests
+ SRCS
+ faccessat_test.cpp
+ DEPENDS
+ libc.include.unistd
+ libc.src.__support.CPP.string
+ libc.src.sys.stat.mkdir
+ libc.src.errno.errno
+ libc.src.fcntl.open
+ libc.src.unistd.faccessat
+ libc.src.unistd.close
+ libc.src.unistd.symlink
+ libc.src.unistd.unlink
+ libc.src.unistd.unlinkat
+ libc.src.unistd.rmdir
+ libc.test.UnitTest.ErrnoCheckingTest
+ libc.test.UnitTest.ErrnoSetterMatcher
+)
+
add_libc_unittest(
fchdir_test
SUITE
diff --git a/libc/test/src/unistd/faccessat_test.cpp b/libc/test/src/unistd/faccessat_test.cpp
new file mode 100644
index 0000000000000..0cbc3c718a2be
--- /dev/null
+++ b/libc/test/src/unistd/faccessat_test.cpp
@@ -0,0 +1,159 @@
+//===-- Unittests for faccessat -------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/fcntl/open.h"
+#include "src/__support/CPP/string.h"
+#include "src/sys/stat/mkdir.h"
+#include "src/unistd/faccessat.h"
+#include "src/unistd/close.h"
+#include "src/unistd/unlink.h"
+#include "src/unistd/unlinkat.h"
+#include "src/unistd/symlink.h"
+#include "src/unistd/rmdir.h"
+#include "src/unistd/symlink.h"
+#include "test/UnitTest/ErrnoCheckingTest.h"
+#include "test/UnitTest/ErrnoSetterMatcher.h"
+#include "test/UnitTest/Test.h"
+
+#include <fcntl.h> // For AT_FDCWD, AT_EACCESS, AT_SYMLINK_NOFOLLOW
+#include <sys/stat.h> // For S_IRWXU, S_IXUSR, etc.
+#include <unistd.h> // For F_OK, R_OK, W_OK, X_OK
+
+
+namespace {
+
+using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
+using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
+
+
+class LlvmLibcFaccessatTest : public LIBC_NAMESPACE::testing::ErrnoCheckingTest {
+public:
+ void create_test_dir(const char* dirname, int& dir_fd) {
+ auto TEST_DIR = libc_make_test_file_path(dirname);
+ ASSERT_THAT(LIBC_NAMESPACE::mkdir(TEST_DIR, S_IRWXU), Succeeds(0));
+
+ dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_RDONLY | O_DIRECTORY);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(dir_fd, 0);
+ }
+
+ void cleanup_test_dir(const char* dirname, int dir_fd) {
+ auto TEST_DIR = libc_make_test_file_path(dirname);
+ ASSERT_THAT(LIBC_NAMESPACE::close(dir_fd), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
+ }
+};
+
+
+TEST_F(LlvmLibcFaccessatTest, CreateAndTest_AT_FDCWD) {
+ // Test access checks on a file with AT_FDCWD, equivalent to access().
+ constexpr const char *FILENAME = "faccessat_basic3.test";
+ auto TEST_FILE = libc_make_test_file_path(FILENAME);
+
+ // Create file with full permissions
+ int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK, 0),
+ Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
+
+ // Create file with execute-only permission
+ fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IXUSR);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK, 0), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, R_OK, 0), Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, W_OK, 0), Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
+}
+
+TEST_F(LlvmLibcFaccessatTest, RelativePathWithDirFD) {
+ LIBC_NAMESPACE::cpp::string DIRNAME ="faccessat_dir3";
+ LIBC_NAMESPACE::cpp::string FILENAME = "relative_file3.txt";
+
+ int dir_fd;
+ create_test_dir(DIRNAME.data(), dir_fd);
+
+ auto FULL_FILE_PATH = libc_make_test_file_path((DIRNAME + "/" + FILENAME).data());
+ int fd = LIBC_NAMESPACE::open(FULL_FILE_PATH, O_WRONLY | O_CREAT, S_IRWXU);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(dir_fd, FILENAME.data(), R_OK | W_OK, 0), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::unlinkat(dir_fd, FILENAME.data(), 0), Succeeds(0));
+ cleanup_test_dir(DIRNAME.data(), dir_fd);
+}
+
+TEST_F(LlvmLibcFaccessatTest, SymlinkNoFollow) {
+ constexpr const char *TARGET = "faccessat_target2";
+ constexpr const char *SYMLINK = "faccessat_link2";
+ auto TEST_TARGET = libc_make_test_file_path(TARGET);
+ auto TEST_SYMLINK = libc_make_test_file_path(SYMLINK);
+
+ int fd = LIBC_NAMESPACE::open(TEST_TARGET, O_WRONLY | O_CREAT, 0);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::symlink(TARGET, TEST_SYMLINK), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, R_OK, 0), Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, F_OK, AT_SYMLINK_NOFOLLOW), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_SYMLINK), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_TARGET), Succeeds(0));
+}
+
+TEST_F(LlvmLibcFaccessatTest, AtEaccess) {
+ // With AT_EACCESS, faccessat checks permissions using the effective user ID,
+ // but the effective and real user ID will be the same here and changing that is not feasible in a test,
+ // so this is just a basic sanity check.
+ constexpr const char *FILENAME = "faccessat_eaccess.test";
+ auto TEST_FILE = libc_make_test_file_path(FILENAME);
+
+ int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK, AT_EACCESS),
+ Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
+}
+
+TEST_F(LlvmLibcFaccessatTest, AtEmptyPath) {
+ constexpr const char *FILENAME = "faccessat_atemptypath.test";
+ auto TEST_FILE = libc_make_test_file_path(FILENAME);
+
+ int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(fd, "", F_OK, AT_EMPTY_PATH), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(fd, "", X_OK | W_OK | R_OK, AT_EMPTY_PATH),
+ Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", F_OK, AT_EMPTY_PATH), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", X_OK | W_OK | R_OK, AT_EMPTY_PATH),
+ Succeeds(0));
+}
+
+} // namespace
\ No newline at end of file
>From 5466675ba8d73b00de29cd734ac60312c0a4cd8d Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Sun, 28 Sep 2025 08:40:57 +0000
Subject: [PATCH 2/6] Formatting
---
libc/src/unistd/faccessat.h | 4 +-
libc/src/unistd/linux/faccessat.cpp | 9 +-
libc/test/src/unistd/faccessat_test.cpp | 125 +++++++++++++-----------
3 files changed, 77 insertions(+), 61 deletions(-)
diff --git a/libc/src/unistd/faccessat.h b/libc/src/unistd/faccessat.h
index e6c7244a8f783..578c22faff258 100644
--- a/libc/src/unistd/faccessat.h
+++ b/libc/src/unistd/faccessat.h
@@ -1,4 +1,5 @@
-//===-- Implementation header for faccessat ------------------------*- C++ -*-===//
+//===-- Implementation header for faccessat ------------------------*- C++
+//-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +10,6 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FACCESSAT_H
#define LLVM_LIBC_SRC_UNISTD_FACCESSAT_H
-
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/unistd/linux/faccessat.cpp b/libc/src/unistd/linux/faccessat.cpp
index 6908fbd75398e..f6efd9a887999 100644
--- a/libc/src/unistd/linux/faccessat.cpp
+++ b/libc/src/unistd/linux/faccessat.cpp
@@ -1,4 +1,5 @@
-//===-- Linux implementation of faccessat ------------------------------------===//
+//===-- Linux implementation of faccessat
+//------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -18,9 +19,11 @@
namespace LIBC_NAMESPACE_DECL {
-LLVM_LIBC_FUNCTION(int, faccessat, (int fd, const char *path, int amode, int flag)) {
+LLVM_LIBC_FUNCTION(int, faccessat,
+ (int fd, const char *path, int amode, int flag)) {
#ifdef SYS_faccessat2
- int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_faccessat2, fd, path, amode, flag);
+ int ret =
+ LIBC_NAMESPACE::syscall_impl<int>(SYS_faccessat2, fd, path, amode, flag);
#else
#error "faccessat2 syscall is not available."
#endif
diff --git a/libc/test/src/unistd/faccessat_test.cpp b/libc/test/src/unistd/faccessat_test.cpp
index 0cbc3c718a2be..9b8c9e5f19b59 100644
--- a/libc/test/src/unistd/faccessat_test.cpp
+++ b/libc/test/src/unistd/faccessat_test.cpp
@@ -6,99 +6,102 @@
//
//===----------------------------------------------------------------------===//
-#include "src/fcntl/open.h"
#include "src/__support/CPP/string.h"
+#include "src/fcntl/open.h"
#include "src/sys/stat/mkdir.h"
-#include "src/unistd/faccessat.h"
#include "src/unistd/close.h"
-#include "src/unistd/unlink.h"
-#include "src/unistd/unlinkat.h"
-#include "src/unistd/symlink.h"
+#include "src/unistd/faccessat.h"
#include "src/unistd/rmdir.h"
#include "src/unistd/symlink.h"
+#include "src/unistd/unlink.h"
+#include "src/unistd/unlinkat.h"
#include "test/UnitTest/ErrnoCheckingTest.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"
-#include <fcntl.h> // For AT_FDCWD, AT_EACCESS, AT_SYMLINK_NOFOLLOW
-#include <sys/stat.h> // For S_IRWXU, S_IXUSR, etc.
-#include <unistd.h> // For F_OK, R_OK, W_OK, X_OK
-
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
namespace {
-using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
+namespace cpp = LIBC_NAMESPACE::cpp;
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
+using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
+using LlvmLibcFaccessatTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest;
-class LlvmLibcFaccessatTest : public LIBC_NAMESPACE::testing::ErrnoCheckingTest {
-public:
- void create_test_dir(const char* dirname, int& dir_fd) {
- auto TEST_DIR = libc_make_test_file_path(dirname);
- ASSERT_THAT(LIBC_NAMESPACE::mkdir(TEST_DIR, S_IRWXU), Succeeds(0));
-
- dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_RDONLY | O_DIRECTORY);
- ASSERT_ERRNO_SUCCESS();
- ASSERT_GT(dir_fd, 0);
- }
-
- void cleanup_test_dir(const char* dirname, int dir_fd) {
- auto TEST_DIR = libc_make_test_file_path(dirname);
- ASSERT_THAT(LIBC_NAMESPACE::close(dir_fd), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
- }
-};
-
-
-TEST_F(LlvmLibcFaccessatTest, CreateAndTest_AT_FDCWD) {
- // Test access checks on a file with AT_FDCWD, equivalent to access().
+TEST_F(LlvmLibcFaccessatTest, WithAtFdcwd) {
+ // Test access checks on a file with AT_FDCWD and no flags, equivalent to
+ // access().
constexpr const char *FILENAME = "faccessat_basic3.test";
auto TEST_FILE = libc_make_test_file_path(FILENAME);
- // Create file with full permissions
+ // Check permissions on a file with full permissions
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
ASSERT_ERRNO_SUCCESS();
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK, 0),
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0),
Succeeds(0));
+ ASSERT_THAT(
+ LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK, 0),
+ Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
- // Create file with execute-only permission
+ // Check permissions on a file with execute-only permission
fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IXUSR);
ASSERT_ERRNO_SUCCESS();
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK, 0), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, R_OK, 0), Fails(EACCES));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, W_OK, 0), Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0),
+ Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK, 0),
+ Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, R_OK, 0),
+ Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, W_OK, 0),
+ Fails(EACCES));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
+
+ // Check permissions on a non existent file
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, F_OK, 0),
+ Fails(ENOENT));
}
TEST_F(LlvmLibcFaccessatTest, RelativePathWithDirFD) {
- LIBC_NAMESPACE::cpp::string DIRNAME ="faccessat_dir3";
- LIBC_NAMESPACE::cpp::string FILENAME = "relative_file3.txt";
+ // Check permissions on a file releative to dir_fd
+ const cpp::string DIRNAME = "faccessat_dir3";
+ const cpp::string FILENAME = "relative_file3.txt";
+
+ auto TEST_DIR = libc_make_test_file_path(DIRNAME.data());
+ ASSERT_THAT(LIBC_NAMESPACE::mkdir(TEST_DIR, S_IRWXU), Succeeds(0));
- int dir_fd;
- create_test_dir(DIRNAME.data(), dir_fd);
+ int dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_RDONLY | O_DIRECTORY);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(dir_fd, 0);
- auto FULL_FILE_PATH = libc_make_test_file_path((DIRNAME + "/" + FILENAME).data());
+ auto FULL_FILE_PATH =
+ libc_make_test_file_path((DIRNAME + "/" + FILENAME).data());
int fd = LIBC_NAMESPACE::open(FULL_FILE_PATH, O_WRONLY | O_CREAT, S_IRWXU);
ASSERT_ERRNO_SUCCESS();
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(dir_fd, FILENAME.data(), R_OK | W_OK, 0), Succeeds(0));
+ ASSERT_THAT(
+ LIBC_NAMESPACE::faccessat(dir_fd, FILENAME.data(), R_OK | W_OK, 0),
+ Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::unlinkat(dir_fd, FILENAME.data(), 0), Succeeds(0));
- cleanup_test_dir(DIRNAME.data(), dir_fd);
+ ASSERT_THAT(LIBC_NAMESPACE::unlinkat(dir_fd, FILENAME.data(), 0),
+ Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::close(dir_fd), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
}
TEST_F(LlvmLibcFaccessatTest, SymlinkNoFollow) {
+ // Check permissions on a symlink itself, not what it links to
constexpr const char *TARGET = "faccessat_target2";
constexpr const char *SYMLINK = "faccessat_link2";
auto TEST_TARGET = libc_make_test_file_path(TARGET);
@@ -111,8 +114,11 @@ TEST_F(LlvmLibcFaccessatTest, SymlinkNoFollow) {
ASSERT_THAT(LIBC_NAMESPACE::symlink(TARGET, TEST_SYMLINK), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, R_OK, 0), Fails(EACCES));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, F_OK, AT_SYMLINK_NOFOLLOW), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, R_OK, 0),
+ Fails(EACCES));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_SYMLINK, F_OK,
+ AT_SYMLINK_NOFOLLOW),
+ Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_SYMLINK), Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_TARGET), Succeeds(0));
@@ -120,8 +126,8 @@ TEST_F(LlvmLibcFaccessatTest, SymlinkNoFollow) {
TEST_F(LlvmLibcFaccessatTest, AtEaccess) {
// With AT_EACCESS, faccessat checks permissions using the effective user ID,
- // but the effective and real user ID will be the same here and changing that is not feasible in a test,
- // so this is just a basic sanity check.
+ // but the effective and real user ID will be the same here and changing that
+ // is not feasible in a test, so this is just a basic sanity check.
constexpr const char *FILENAME = "faccessat_eaccess.test";
auto TEST_FILE = libc_make_test_file_path(FILENAME);
@@ -130,7 +136,8 @@ TEST_F(LlvmLibcFaccessatTest, AtEaccess) {
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK, AT_EACCESS),
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, TEST_FILE, X_OK | W_OK | R_OK,
+ AT_EACCESS),
Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
@@ -144,15 +151,21 @@ TEST_F(LlvmLibcFaccessatTest, AtEmptyPath) {
ASSERT_ERRNO_SUCCESS();
ASSERT_GT(fd, 0);
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(fd, "", F_OK, AT_EMPTY_PATH), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(fd, "", X_OK | W_OK | R_OK, AT_EMPTY_PATH),
+ // Check permissions on the file referred to by fd
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(fd, "", F_OK, AT_EMPTY_PATH),
Succeeds(0));
+ ASSERT_THAT(
+ LIBC_NAMESPACE::faccessat(fd, "", X_OK | W_OK | R_OK, AT_EMPTY_PATH),
+ Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::unlink(TEST_FILE), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", F_OK, AT_EMPTY_PATH), Succeeds(0));
- ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", X_OK | W_OK | R_OK, AT_EMPTY_PATH),
+ // Check permissions on the current working directory
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", F_OK, AT_EMPTY_PATH),
+ Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::faccessat(AT_FDCWD, "", X_OK | W_OK | R_OK,
+ AT_EMPTY_PATH),
Succeeds(0));
}
>From 30febb77a378e4437113f4ed8394ef0416cd6b57 Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Sun, 28 Sep 2025 08:57:48 +0000
Subject: [PATCH 3/6] Remove redundant param from faccessat syscall
---
libc/src/unistd/linux/access.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/src/unistd/linux/access.cpp b/libc/src/unistd/linux/access.cpp
index 55cd6adca779d..f06eec5a8db6a 100644
--- a/libc/src/unistd/linux/access.cpp
+++ b/libc/src/unistd/linux/access.cpp
@@ -23,7 +23,7 @@ LLVM_LIBC_FUNCTION(int, access, (const char *path, int mode)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_access, path, mode);
#elif defined(SYS_faccessat)
int ret =
- LIBC_NAMESPACE::syscall_impl<int>(SYS_faccessat, AT_FDCWD, path, mode, 0);
+ LIBC_NAMESPACE::syscall_impl<int>(SYS_faccessat, AT_FDCWD, path, mode);
#else
#error "access and faccessat syscalls not available."
#endif
>From eecd8f3706d6cbf84dcdd5344cbec648e7c854f9 Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Sun, 28 Sep 2025 09:17:02 +0000
Subject: [PATCH 4/6] Fix AT_EACCESS definition
---
libc/include/llvm-libc-macros/linux/fcntl-macros.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/include/llvm-libc-macros/linux/fcntl-macros.h b/libc/include/llvm-libc-macros/linux/fcntl-macros.h
index 632bcbe9d0716..74d406f742f38 100644
--- a/libc/include/llvm-libc-macros/linux/fcntl-macros.h
+++ b/libc/include/llvm-libc-macros/linux/fcntl-macros.h
@@ -62,7 +62,7 @@
#define AT_EMPTY_PATH 0x1000
// Perform access checks using the effective user and group IDs.
-#define AT_EACCESS
+#define AT_EACCESS 0x200
// Values of SYS_fcntl commands.
#define F_DUPFD 0
>From bce623ea5aecb73332e4a5b9f6dfd2b4c0cfddb6 Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Sun, 28 Sep 2025 09:17:02 +0000
Subject: [PATCH 5/6] Cleanup
---
libc/test/src/unistd/faccessat_test.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libc/test/src/unistd/faccessat_test.cpp b/libc/test/src/unistd/faccessat_test.cpp
index 9b8c9e5f19b59..2dff0b21cccfb 100644
--- a/libc/test/src/unistd/faccessat_test.cpp
+++ b/libc/test/src/unistd/faccessat_test.cpp
@@ -34,7 +34,7 @@ using LlvmLibcFaccessatTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest;
TEST_F(LlvmLibcFaccessatTest, WithAtFdcwd) {
// Test access checks on a file with AT_FDCWD and no flags, equivalent to
// access().
- constexpr const char *FILENAME = "faccessat_basic3.test";
+ constexpr const char *FILENAME = "faccessat_basic.test";
auto TEST_FILE = libc_make_test_file_path(FILENAME);
// Check permissions on a file with full permissions
@@ -73,8 +73,8 @@ TEST_F(LlvmLibcFaccessatTest, WithAtFdcwd) {
TEST_F(LlvmLibcFaccessatTest, RelativePathWithDirFD) {
// Check permissions on a file releative to dir_fd
- const cpp::string DIRNAME = "faccessat_dir3";
- const cpp::string FILENAME = "relative_file3.txt";
+ const cpp::string DIRNAME = "faccessat_dir";
+ const cpp::string FILENAME = "relative_file.txt";
auto TEST_DIR = libc_make_test_file_path(DIRNAME.data());
ASSERT_THAT(LIBC_NAMESPACE::mkdir(TEST_DIR, S_IRWXU), Succeeds(0));
@@ -102,8 +102,8 @@ TEST_F(LlvmLibcFaccessatTest, RelativePathWithDirFD) {
TEST_F(LlvmLibcFaccessatTest, SymlinkNoFollow) {
// Check permissions on a symlink itself, not what it links to
- constexpr const char *TARGET = "faccessat_target2";
- constexpr const char *SYMLINK = "faccessat_link2";
+ constexpr const char *TARGET = "faccessat_target";
+ constexpr const char *SYMLINK = "faccessat_link";
auto TEST_TARGET = libc_make_test_file_path(TARGET);
auto TEST_SYMLINK = libc_make_test_file_path(SYMLINK);
@@ -169,4 +169,4 @@ TEST_F(LlvmLibcFaccessatTest, AtEmptyPath) {
Succeeds(0));
}
-} // namespace
\ No newline at end of file
+} // namespace
>From 7eb506da34c3600de3134c0c3752295130ee354a Mon Sep 17 00:00:00 2001
From: Marcell Leleszi <mleleszi at google.com>
Date: Tue, 30 Sep 2025 18:11:05 +0000
Subject: [PATCH 6/6] Minor formatting, dependency fixes
---
libc/src/unistd/faccessat.h | 3 +--
libc/src/unistd/linux/CMakeLists.txt | 1 -
libc/src/unistd/linux/faccessat.cpp | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/libc/src/unistd/faccessat.h b/libc/src/unistd/faccessat.h
index 578c22faff258..0dc834dbd7cae 100644
--- a/libc/src/unistd/faccessat.h
+++ b/libc/src/unistd/faccessat.h
@@ -1,5 +1,4 @@
-//===-- Implementation header for faccessat ------------------------*- C++
-//-*-===//
+//===-- Implementation header for faccessat ---------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
index 0b67417475b71..dff6ba2db8a38 100644
--- a/libc/src/unistd/linux/CMakeLists.txt
+++ b/libc/src/unistd/linux/CMakeLists.txt
@@ -88,7 +88,6 @@ add_entrypoint_object(
../faccessat.h
DEPENDS
libc.hdr.fcntl_macros
- libc.include.unistd
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
diff --git a/libc/src/unistd/linux/faccessat.cpp b/libc/src/unistd/linux/faccessat.cpp
index f6efd9a887999..7a2a29cb0e901 100644
--- a/libc/src/unistd/linux/faccessat.cpp
+++ b/libc/src/unistd/linux/faccessat.cpp
@@ -1,5 +1,4 @@
-//===-- Linux implementation of faccessat
-//------------------------------------===//
+//===-- Linux implementation of faccessat ---------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
More information about the libc-commits
mailing list