From 66658d82c631fb59a13b9f518fcbf39408e12bb3 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 25 Dec 2023 07:59:03 -0800
Subject: [PATCH] Linux: Uprev kernel to 6.4

Added a new prctl that we need to emulate.
Some ioctls have changed that we don't really care about or will
naturally work.
---
 .../LinuxEmulation/LinuxSyscalls/Syscalls.cpp |  2 +-
 .../LinuxSyscalls/Syscalls/Thread.cpp         | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp
index cbeeedb6c..4d35664c1 100644
--- a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp
+++ b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp
@@ -773,7 +773,7 @@ uint32_t SyscallHandler::CalculateHostKernelVersion() {
 
 uint32_t SyscallHandler::CalculateGuestKernelVersion() {
   // We currently only emulate a kernel between the ranges of Kernel 5.0.0 and 6.2.0
-  return std::max(KernelVersion(5, 0), std::min(KernelVersion(6, 2), GetHostKernelVersion()));
+  return std::max(KernelVersion(5, 0), std::min(KernelVersion(6, 4), GetHostKernelVersion()));
 }
 
 uint64_t SyscallHandler::HandleSyscall(FEXCore::Core::CpuStateFrame *Frame, FEXCore::HLE::SyscallArguments *Args) {
diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp
index 696fc705e..04edcffcc 100644
--- a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp
+++ b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp
@@ -15,6 +15,7 @@ $end_info$
 #include "LinuxSyscalls/x32/Thread.h"
 
 #include <FEXCore/Core/Context.h>
+#include <FEXCore/Core/CodeLoader.h>
 #include <FEXCore/Core/X86Enums.h>
 #include <FEXCore/Debug/InternalThreadState.h>
 #include <FEXCore/IR/IR.h>
@@ -521,12 +522,33 @@ namespace FEX::HLE {
     REGISTER_SYSCALL_IMPL_FLAGS(prctl, SyscallFlags::OPTIMIZETHROUGH | SyscallFlags::NOSYNCSTATEONENTRY,
       [](FEXCore::Core::CpuStateFrame *Frame, int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) -> uint64_t {
       uint64_t Result{};
+#ifndef PR_GET_AUXV
+#define PR_GET_AUXV 0x41555856
+#endif
       switch (option) {
       case PR_SET_SECCOMP:
       case PR_GET_SECCOMP:
         // FEX doesn't support seccomp
         return -EINVAL;
         break;
+      case PR_GET_AUXV: {
+        if (arg4 || arg5) {
+          return -EINVAL;
+        }
+
+        void* addr = reinterpret_cast<void*>(arg2);
+        size_t UserSize = reinterpret_cast<size_t>(arg3);
+
+        uint64_t auxvBase=0;
+        uint64_t auxvSize=0;
+        FEX::HLE::_SyscallHandler->GetCodeLoader()->GetAuxv(auxvBase, auxvSize);
+        size_t MinSize = std::min(auxvSize, UserSize);
+
+        memcpy(addr, reinterpret_cast<void*>(auxvBase), MinSize);
+
+        // Returns the size of auxv without truncation.
+        return auxvSize;
+      }
       default:
         Result = ::prctl(option, arg2, arg3, arg4, arg5);
       break;