File 0019-linux-user-fix-segmentation-fault-p.patch of Package qemu

Overview Repositories Revisions Requests Users Attributes Meta

File 0019-linux-user-fix-segmentation-fault-p.patch of Package qemu (Revision c5a2c16603f1edfaa1280fed08b15d30)

Currently displaying revision c5a2c16603f1edfaa1280fed08b15d30 , Show latest

From fe51d474086e98a87732b693c5a715691d03a42d 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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/user-exec.c b/user-exec.c
index dd46019..1e8d3f1 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -99,9 +99,11 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
         return 1;
     }
 
-    /* Convert forcefully to guest address space, invalid addresses
-       are still valid segv ones */
-    address = h2g_nocheck(address);
+    if (RESERVED_VA) {
+        /* Convert forcefully to guest address space, invalid addresses
+           are still valid segv ones */
+        address = address - GUEST_BASE;
+    }
 
     env = current_cpu->env_ptr;
     /* see if it is an MMU fault */

Places

File 0019-linux-user-fix-segmentation-fault-p.patch of Package qemu (Revision c5a2c16603f1edfaa1280fed08b15d30)

Places