42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From c26be2e327b4bc628ce69ea4493d89b76e7c5161 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Graf <agraf@suse.de>
|
||
|
|
Date: Mon, 25 Jun 2012 19:02:32 +0200
|
||
|
|
Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
When forwarding a segmentation fault into the guest process, we were passing
|
||
|
|
the host's address directly into the guest process's signal descriptor.
|
||
|
|
|
||
|
|
That obviously confused the guest process, since it didn't know what to make
|
||
|
|
of the (usually 32-bit truncated) address. Passing in g2h(address) makes the
|
||
|
|
guest process a lot happier.
|
||
|
|
|
||
|
|
This fixes java running in arm-linux-user for me.
|
||
|
|
|
||
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||
|
|
[AF: Rebased onto AREG0 fix for v1.2, squashed fixup by agraf]
|
||
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||
|
|
---
|
||
|
|
user-exec.c | 6 ++++++
|
||
|
|
1 files changed, 6 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/user-exec.c b/user-exec.c
|
||
|
|
index 5a04218..bc3eef9 100644
|
||
|
|
--- a/user-exec.c
|
||
|
|
+++ b/user-exec.c
|
||
|
|
@@ -112,6 +112,12 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (RESERVED_VA) {
|
||
|
|
+ /* Convert forcefully to guest address space, invalid addresses
|
||
|
|
+ are still valid segv ones */
|
||
|
|
+ address = address - GUEST_BASE;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* see if it is an MMU fault */
|
||
|
|
ret = cpu_handle_mmu_fault(cpu_single_env, address, is_write,
|
||
|
|
MMU_USER_IDX);
|