diff options
| author | Alexander Graf <agraf@suse.de> | 2012-01-13 17:05:41 +0100 |
|---|---|---|
| committer | hyokeun <hyokeun.jeon@samsung.com> | 2016-09-06 15:55:31 +0900 |
| commit | 6d51e4f117ee530d466855546169a0212cdf8ea4 (patch) | |
| tree | db643ee4808a098e3d04e0a8fb86fe8e620899f1 | |
| parent | 9d721e1a0b3fc49081b37a6d7ead77da667d87e9 (diff) | |
| download | qemu-6d51e4f117ee530d466855546169a0212cdf8ea4.tar.gz qemu-6d51e4f117ee530d466855546169a0212cdf8ea4.tar.bz2 qemu-6d51e4f117ee530d466855546169a0212cdf8ea4.zip | |
linux-user: fix segfault deadlock
When entering the guest we take a lock to ensure that nobody else messes
with our TB chaining while we're doing it. If we get a segfault inside that
code, we manage to work on, but will not unlock the lock.
This patch forces unlocking of that lock in the segv handler. I'm not sure
this is the right approach though. Maybe we should rather make sure we don't
segfault in the code? I would greatly appreciate someone more intelligible
than me to look at this :).
Example code to trigger this is at: http://csgraf.de/tmp/conftest.c
Reported-by: Fabio Erculiani <lxnay@sabayon.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Drop spinlock_safe_unlock() and switch to tb_lock_reset() (bonzini)]
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | user-exec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/user-exec.c b/user-exec.c index 95f9f97c5..eaeb0b4aa 100644 --- a/user-exec.c +++ b/user-exec.c @@ -65,6 +65,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", pc, address, is_write, *(unsigned long *)old_set); #endif + + /* Maybe we're still holding the TB fiddling lock? */ + tb_lock_reset(); + /* XXX: locking issue */ if (is_write && h2g_valid(address)) { switch (page_unprotect(h2g(address), pc)) { |