Skip to content

fix(libkernel_sys): fchmodat follows a symbolic link like chmod #11288

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
oneandonlydean merged 1 commit into from
Oct 26, 2026
Merged

fix(libkernel_sys): fchmodat follows a symbolic link like chmod #11288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions core/libs/prx/libkernel/File/include/DirectoryDescriptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ extern "C" const char* GetDirectoryDescriptorPath_nid_no_patch(int fd, int* erro
extern "C" std::uint64_t GetDirectoryDescriptorPosition_nid_no_patch(int fd);
extern "C" int OpenInDirectory_nid_no_patch(int directory, const char* path, int flags, std::uint16_t mode);
extern "C" int StatInDirectory_nid_no_patch(int directory, const char* path, FileStat* sb, bool follow);
extern "C" int ChmodNative_nid_no_patch(const std::filesystem::path& native, int mode);

namespace File {

Expand Down
4 changes: 4 additions & 0 deletions core/libs/prx/libkernel/File/src/Stdio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,10 @@ int APS5_VABI chmod_nid_postfix(const char* path, int mode) {
return 0;
}

int ChmodNative_nid_no_patch(const std::filesystem::path& native, int mode) {
return NativeChmod(native, mode);
}

int APS5_VABI chflags_nid_postfix(const char* path, std::uint64_t flags) {
std::string copy;
if (const int error = PathError(path, copy)) return PosixFailure(error);
Expand Down
6 changes: 1 addition & 5 deletions core/libs/prx/libkernel_sys/Export.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,11 +694,7 @@ int APS5_VABI fchmodat_nid_postfix(int fd, const char* path, int mode, int flag)
return 0;
}
}
#ifdef _WIN32
if (::_wchmod(native.wstring().c_str(), mode & 07777) != 0) return static_cast<int>(Fail(errno == ENOENT && HasNonDirectoryPrefix(native) ? GuestEnotdir : GuestFileError(errno)));
#else
if (::chmod(native.c_str(), static_cast<mode_t>(mode & 07777)) != 0) return static_cast<int>(Fail(errno == ENOENT && HasNonDirectoryPrefix(native) ? GuestEnotdir : GuestFileError(errno)));
#endif
if (ChmodNative_nid_no_patch(native, mode & 07777) != 0) return static_cast<int>(Fail(errno == ENOENT && HasNonDirectoryPrefix(native) ? GuestEnotdir : GuestFileError(errno)));
RecordWrittenPath_nid_no_patch(native);
return 0;
}
Expand Down
23 changes: 23 additions & 0 deletions core/libs/tests/GuestKernelSys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,29 @@ int main() {
Require((std::filesystem::status(modeFile).permissions() & std::filesystem::perms::all) == readable);
Require(RemoveSymlink(modeLink));
#endif
const auto chmodTarget = (root / "chmod-target.txt").string();
{ std::ofstream file(chmodTarget); file << "x"; }
const auto chmodLink = (root / "chmod-link.txt").string();
const auto chmodDangling = (root / "chmod-dangling.txt").string();
const auto chmodLoopA = (root / "chmod-loop-a").string();
const auto chmodLoopB = (root / "chmod-loop-b").string();
if (symlink_nid_postfix("chmod-target.txt", chmodLink.c_str()) == 0) {
Require(symlink_nid_postfix("chmod-missing.txt", chmodDangling.c_str()) == 0);
Require(symlink_nid_postfix("chmod-loop-b", chmodLoopA.c_str()) == 0 && symlink_nid_postfix("chmod-loop-a", chmodLoopB.c_str()) == 0);
const auto writable = [&] {
FileStat linked{};
Require(stat_nid_postfix(chmodTarget.c_str(), &linked) == 0);
return (linked.st_mode & 0222) != 0;
};
Require(writable());
Require(fchmodat_nid_postfix(base, "chmod-link.txt", 0400, 0) == 0 && !writable());
Require(fchmodat_nid_postfix(-100, chmodLink.c_str(), 0600, 0) == 0 && writable());
Require(fchmodat_nid_postfix(base, "chmod-dangling.txt", 0600, 0) == -1 && Error() == 2);
Require(fchmodat_nid_postfix(-100, chmodDangling.c_str(), 0600, 0) == -1 && Error() == 2);
Require(fchmodat_nid_postfix(base, "chmod-loop-a", 0600, 0) == -1 && Error() == 62);
Require(fchmodat_nid_postfix(base, "chmod-link.txt/child", 0600, 0) == -1 && Error() == 20);
Require(RemoveSymlink(chmodLink) && RemoveSymlink(chmodDangling) && RemoveSymlink(chmodLoopA) && RemoveSymlink(chmodLoopB));
}
Require(fchown_nid_postfix(base, 0, 0) == 0);
Require(fchown_nid_postfix(base, 0xFFFFFFFFu, 0xFFFFFFFFu) == 0);
Require(fchown_nid_postfix(-1, 0, 0) == -1 && Error() == 9);
Expand Down
Loading