Force stack alignment

rapid7 · Aug 13, 2020 · 5877c79 · 5877c79
1 parent f043e4b
commit 5877c79
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/msf/core/exe/segment_injector.rb b/lib/msf/core/exe/segment_injector.rb
@@ -58,6 +58,9 @@ def create_thread_stub
 
     def create_thread_stub_x64
       <<-EOS
+        push rbp
+        mov rbp, rsp
+        and rsp, FFFFFFFFFFFFFFF0h
         sub rsp, 38h
 
         mov rcx, hook_libname
@@ -77,8 +80,7 @@ def create_thread_stub_x64
         mov rdx, rcx
         call rax
 
-        add rsp, 38h
-
+        leave
         jmp entrypoint
 
         hook_libname db 'kernel32', 0