Merge pull request #751 from FEX-Emu/skmp/fix-fchmodat-faccessat

Syscalls: chmodat, faccessat glibc interface differs from kernel
FEX-Emu · Feb 2, 2021 · 0aaed41 · 0aaed41
2 parents 4d05438 + 3eed439
commit 0aaed41
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Source/Tests/LinuxSyscalls/FileManagement.cpp b/Source/Tests/LinuxSyscalls/FileManagement.cpp
@@ -13,6 +13,7 @@
 #include <sys/uio.h>
 #include <sys/vfs.h>
 #include <unistd.h>
+#include <sys/syscall.h>
 
 namespace FEX::HLE {
 
@@ -83,15 +84,15 @@ uint64_t FileManager::Access(const char *pathname, [[maybe_unused]] int mode) {
   return ::access(pathname, mode);
 }
 
-uint64_t FileManager::FAccessat(int dirfd, const char *pathname, int mode, int flags) {
+uint64_t FileManager::FAccessat(int dirfd, const char *pathname, int mode) {
   auto Path = GetEmulatedPath(pathname);
   if (!Path.empty()) {
-    uint64_t Result = ::faccessat(dirfd, Path.c_str(), mode, flags);
+    uint64_t Result = ::syscall(SYS_faccessat, dirfd, Path.c_str(), mode);
     if (Result != -1)
       return Result;
   }
 
-  return ::faccessat(dirfd, pathname, mode, flags);
+  return ::syscall(SYS_faccessat, dirfd, pathname, mode);
 }
 
 uint64_t FileManager::Readlink(const char *pathname, char *buf, size_t bufsiz) {

diff --git a/Source/Tests/LinuxSyscalls/FileManagement.h b/Source/Tests/LinuxSyscalls/FileManagement.h
@@ -27,7 +27,7 @@ class FileManager final {
   uint64_t Stat(const char *pathname, void *buf);
   uint64_t Lstat(const char *path, void *buf);
   uint64_t Access(const char *pathname, int mode);
-  uint64_t FAccessat(int dirfd, const char *pathname, int mode, int flags);
+  uint64_t FAccessat(int dirfd, const char *pathname, int mode);
   uint64_t Readlink(const char *pathname, char *buf, size_t bufsiz);
   uint64_t Chmod(const char *pathname, mode_t mode);
   uint64_t Readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);

diff --git a/Source/Tests/LinuxSyscalls/Syscalls/FD.cpp b/Source/Tests/LinuxSyscalls/Syscalls/FD.cpp
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/eventfd.h>
+#include <sys/syscall.h>
 
 namespace FEX::HLE {
   static int RemapFlags(int flags) {
@@ -217,13 +218,13 @@ namespace FEX::HLE {
       SYSCALL_ERRNO();
     });
 
-    REGISTER_SYSCALL_IMPL(fchmodat, [](FEXCore::Core::InternalThreadState *Thread, int dirfd, const char *pathname, mode_t mode, int flags) -> uint64_t {
-      uint64_t Result = fchmodat(dirfd, pathname, mode, flags);
+    REGISTER_SYSCALL_IMPL(fchmodat, [](FEXCore::Core::InternalThreadState *Thread, int dirfd, const char *pathname, mode_t mode) -> uint64_t {
+      uint64_t Result = syscall(SYS_fchmodat, dirfd, pathname, mode);
       SYSCALL_ERRNO();
     });
 
-    REGISTER_SYSCALL_IMPL(faccessat, [](FEXCore::Core::InternalThreadState *Thread, int dirfd, const char *pathname, int mode, int flags) -> uint64_t {
-      uint64_t Result = FEX::HLE::_SyscallHandler->FM.FAccessat(dirfd, pathname, mode, flags);
+    REGISTER_SYSCALL_IMPL(faccessat, [](FEXCore::Core::InternalThreadState *Thread, int dirfd, const char *pathname, int mode) -> uint64_t {
+      uint64_t Result = FEX::HLE::_SyscallHandler->FM.FAccessat(dirfd, pathname, mode);
       SYSCALL_ERRNO();
     });
 

diff --git a/unittests/gvisor-tests/Known_Failures b/unittests/gvisor-tests/Known_Failures
@@ -68,7 +68,6 @@ aio_test
 alarm_test
 arch_prctl_test
 bad_test
-chmod_test
 chown_test
 clock_nanosleep_test
 concurrency_test