From 3b7c36e1ba435e96e16c81d11b5c8a526513ff21 Mon Sep 17 00:00:00 2001
From: Vinicius Rangel <me@viniciusrangel.dev>
Date: Wed, 7 May 2025 19:20:55 -0300
Subject: [PATCH] Clear stack before executing guest code (#2877)

* Clear stack before executing guest code

* clang, don't optimize me :rotating_light:

avoid ClearStack function being optimized in release builds
---
 src/core/tls.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/core/tls.h b/src/core/tls.h
index 6edd6a297..46ca8153b 100644
--- a/src/core/tls.h
+++ b/src/core/tls.h
@@ -5,6 +5,8 @@
 
 #include "common/types.h"
 
+void* memset(void* ptr, int value, size_t num);
+
 namespace Xbyak {
 class CodeGenerator;
 }
@@ -41,9 +43,18 @@ Tcb* GetTcbBase();
 /// Makes sure TLS is initialized for the thread before entering guest.
 void EnsureThreadInitialized();
 
+template <size_t size>
+__attribute__((optnone)) void ClearStack() {
+    volatile void* buf = alloca(size);
+    memset(const_cast<void*>(buf), 0, size);
+    buf = nullptr;
+}
+
 template <class ReturnType, class... FuncArgs, class... CallArgs>
 ReturnType ExecuteGuest(PS4_SYSV_ABI ReturnType (*func)(FuncArgs...), CallArgs&&... args) {
     EnsureThreadInitialized();
+    // clear stack to avoid trash from EnsureThreadInitialized
+    ClearStack<13_KB>();
     return func(std::forward<CallArgs>(args)...);
 }