Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add patch for docker/for-mac/issues/7172 #160

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Add patch for docker/for-mac/issues/7172 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ target "buildkit-test" {
target "desktop" {
inherits = ["mainline"]
args = {
QEMU_PATCHES = "${QEMU_PATCHES},subreaper-prctl"
QEMU_PATCHES = "${QEMU_PATCHES},subreaper-prctl,pretcode"
}
cache-from = ["${REPO}:desktop-master"]
}
Expand Down
51 changes: 51 additions & 0 deletions patches/pretcode/0001-incorrect-alignment-pretcode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From: fanwj
Subject: [PATCH] linux-user: fix incorrect alignment of pretcode
Date: Fri, 12 May 2023 23:38:34 +0800 (GMT+08:00)
sigframe::pretcode & rt_sigframe::pretcode must align of 16n-sizeof(void*)
instead of 16n, Because rsp align of 16n before instruction "call" in caller,
After "call", push address of "call" in caller. sp of begin in callee is
16n-sizeof(void*)

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1648
Signed-off-by: Fan WenJie <fanwj@mail.ustc.edu.cn>

---
linux-user/i386/signal.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c
index 60fa07d6f9c..1f019689ae7 100644
--- a/linux-user/i386/signal.c
+++ b/linux-user/i386/signal.c
@@ -197,7 +197,8 @@ struct sigframe {
* to it ensures that the base of the frame has an appropriate alignment
* too.
*/
- struct target_fpstate fpstate QEMU_ALIGNED(8);
+ abi_ulong unused QEMU_ALIGNED(8);
+ struct target_fpstate fpstate;
};
#define TARGET_SIGFRAME_FXSAVE_OFFSET ( \
offsetof(struct sigframe, fpstate) + TARGET_FPSTATE_FXSAVE_OFFSET)
@@ -210,7 +211,8 @@ struct rt_sigframe {
struct target_siginfo info;
struct target_ucontext uc;
char retcode[8];
- struct target_fpstate fpstate QEMU_ALIGNED(8);
+ abi_ulong unused QEMU_ALIGNED(8);
+ struct target_fpstate fpstate;
};
#define TARGET_RT_SIGFRAME_FXSAVE_OFFSET ( \
offsetof(struct rt_sigframe, fpstate) + TARGET_FPSTATE_FXSAVE_OFFSET)
@@ -220,7 +222,8 @@ struct rt_sigframe {
abi_ulong pretcode;
struct target_ucontext uc;
struct target_siginfo info;
- struct target_fpstate fpstate QEMU_ALIGNED(16);
+ abi_ulong unused QEMU_ALIGNED(16);
+ struct target_fpstate fpstate;
};
#define TARGET_RT_SIGFRAME_FXSAVE_OFFSET ( \
offsetof(struct rt_sigframe, fpstate) + TARGET_FPSTATE_FXSAVE_OFFSET)
--
2.40.1
Loading