Linux: Implements support for EFAULT with ppoll's timeout

Only need to handle the timeout structure, the rest is handled in the kernel itself.
FEX-Emu · Jan 17, 2024 · 92ef9e7 · 92ef9e7
1 parent ca8d3f5
commit 92ef9e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FD.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FD.cpp
@@ -263,7 +263,12 @@ namespace FEX::HLE::x32 {
       struct timespec tp64{};
       struct timespec *timed_ptr{};
       if (timeout_ts) {
-        tp64 = *timeout_ts;
+        struct timespec32 timeout{};
+        if (FaultSafeMemcpy::CopyFromUser(&timeout, timeout_ts, sizeof(timeout)) == EFAULT) {
+          return -EFAULT;
+        }
+
+        tp64 = timeout;
         timed_ptr = &tp64;
       }
 
@@ -275,7 +280,11 @@ namespace FEX::HLE::x32 {
         sigsetsize);
 
       if (timeout_ts) {
-        *timeout_ts = tp64;
+        struct timespec32 timeout{};
+        timeout = tp64;
+
+        // If the copy fails to update the timeout, then this is safe to ignore the result.
+        FaultSafeMemcpy::CopyToUser(timeout_ts, &timeout, sizeof(timeout));
       }
 
       SYSCALL_ERRNO();

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Types.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Types.h
@@ -127,7 +127,7 @@ timespec32 {
   int32_t tv_sec;
   int32_t tv_nsec;
 
-  timespec32() = delete;
+  timespec32() = default;
 
   operator timespec() const {
     timespec spec{};