Skip to content

Reapply "[libc] Return errno from OFD failure paths in fcntl." (#166658) #166846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 10, 2025
Merged

Reapply "[libc] Return errno from OFD failure paths in fcntl." (#166658) #166846

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40a8a2b
Reapply "[libc] Return errno from OFD failure paths in fcntl." (#166658)
jtstogel Nov 5, 2025
86f4811
Pass a struct flock into fcntl F_OFD_GETLK.
jtstogel Nov 6, 2025
526e6ab
Merge branch 'main' into refix-fnctl
jtstogel Nov 6, 2025
af9df0c
Fix typo.
jtstogel Nov 6, 2025
ca1a3e9
Remove unnecessary struct qualifier.
jtstogel Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions libc/test/src/fcntl/fcntl_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,19 @@ class LibcFcntlCommonLockTests : public LlvmLibcFcntlTest {
int fd =
LIBC_NAMESPACE::open(TEST_FILE, O_CREAT | O_TRUNC | O_RDWR, S_IRWXU);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
ASSERT_EQ(-1, LIBC_NAMESPACE::fcntl(fd, GETLK_CMD));

struct flock flk = {};
Copy link
Contributor

@lntue lntue Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: remove struct if there is no name conflict.

flk.l_type = F_RDLCK;
flk.l_start = 0;
flk.l_whence = SEEK_SET;
flk.l_len = 50;
ASSERT_EQ(-1, LIBC_NAMESPACE::fcntl(fd, GETLK_CMD, &flk));
ASSERT_ERRNO_EQ(EBADF);
}
};

#define COMMON_LOCK_TESTS(NAME, GETLK, SETLK) \
using NAME = LibcFcntlCommonLockTests<GETLK, SETLK>; \
#define COMMON_LOCK_TESTS(NAME, GETLK_CMD, SETLK_CMD) \
using NAME = LibcFcntlCommonLockTests<GETLK_CMD, GETLK_CMD>; \
TEST_F(NAME, GetLkRead) { GetLkRead(); } \
TEST_F(NAME, GetLkWrite) { GetLkWrite(); } \
TEST_F(NAME, UseAfterClose) { UseAfterClose(); } \
Expand All @@ -188,6 +194,16 @@ COMMON_LOCK_TESTS(LlvmLibcFcntlProcessAssociatedLockTest, F_GETLK, F_SETLK);
COMMON_LOCK_TESTS(LlvmLibcFcntlOpenFileDescriptionLockTest, F_OFD_GETLK,
F_OFD_SETLK);

TEST_F(LlvmLibcFcntlTest, UseAfterClose) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
constexpr const char *TEST_FILE_NAME = "testdata/fcntl_use_after_close.test";
auto TEST_FILE = libc_make_test_file_path(TEST_FILE_NAME);
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_CREAT | O_TRUNC | O_RDWR, S_IRWXU);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
ASSERT_EQ(-1, LIBC_NAMESPACE::fcntl(fd, F_GETFL));
ASSERT_ERRNO_EQ(EBADF);
}

TEST_F(LlvmLibcFcntlTest, SetGetOwnerTest) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
pid_t pid = LIBC_NAMESPACE::getpid();
Expand Down