1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 687e47f8a796..d309f30cf7af 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -46,6 +46,8 @@
 #include <asm/frame.h>
 #include <asm/nospec-branch.h>
 
+#include "calling.h"
+
         .section .entry.text, "ax"
 
 /*
@@ -712,6 +714,7 @@ ENTRY(ret_from_fork)
         /* When we fork, we trace the syscall return in the child, too. */
         movl    %esp, %eax
         call    syscall_return_slowpath
+        STACKLEAK_ERASE
         jmp     restore_all
 
         /* kernel thread */
@@ -886,6 +889,8 @@ ENTRY(entry_SYSENTER_32)
         ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
                     "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
 
+        STACKLEAK_ERASE
+
 /* Opportunistic SYSEXIT */
         TRACE_IRQS_ON                   /* User mode traces as IRQs on. */
 
@@ -997,6 +1002,8 @@ ENTRY(entry_INT80_32)
         call    do_int80_syscall_32
 .Lsyscall_32_done:
 
+        STACKLEAK_ERASE
+
 restore_all:
         TRACE_IRQS_IRET
         SWITCH_TO_ENTRY_STACK