From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 5 Jan 2022 05:14:23 +0000 (-0800)
Subject: common-user: Really fix i386 calls to safe_syscall_set_errno_tail
X-Git-Tag: v7.0.0-rc0~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb084237a3b78b20fd9d888dffd673b6656ea3be;p=thirdparty%2Fqemu.git

common-user: Really fix i386 calls to safe_syscall_set_errno_tail

Brown bag time: offset 0 from esp is the return address,
offset 4 is the first argument.

Fixes: d7478d4229f0 ("common-user: Fix tail calls to safe_syscall_set_errno_tail")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/common-user/host/i386/safe-syscall.inc.S b/common-user/host/i386/safe-syscall.inc.S
index 9c45e56e480..db2ed098394 100644
--- a/common-user/host/i386/safe-syscall.inc.S
+++ b/common-user/host/i386/safe-syscall.inc.S
@@ -120,7 +120,7 @@ safe_syscall_end:
         pop     %ebp
         .cfi_adjust_cfa_offset -4
         .cfi_restore ebp
-        mov     %eax, (%esp)
+        mov     %eax, 4(%esp)
         jmp     safe_syscall_set_errno_tail
 
         .cfi_endproc