diff options
| author | Alexander Graf <agraf@suse.de> | 2012-05-30 14:45:21 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2012-10-12 13:58:13 +0300 |
| commit | 1bdd7c7ea8a711efcb5141663865cc1f7e4e824d (patch) | |
| tree | 79a4d6f08dd56e7f5d27cc7db2cb976187db72d9 /linux-user | |
| parent | 229d3376a38bf97aa09b6f73a957c5389badcd06 (diff) | |
| download | qemu-1bdd7c7ea8a711efcb5141663865cc1f7e4e824d.tar.gz qemu-1bdd7c7ea8a711efcb5141663865cc1f7e4e824d.tar.bz2 qemu-1bdd7c7ea8a711efcb5141663865cc1f7e4e824d.zip | |
linux-user: fix multi-threaded /proc/self/maps
When reading our faked /proc/self/maps from a secondary thread,
we get an invalid stack entry. This is because ts->stack_base is not
initialized in non-primary threads.
However, ts->info is, and the stack layout information we're looking
for is there too. So let's use that one instead!
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/syscall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1a381699ef..cf0b3858fa 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4962,8 +4962,8 @@ static int open_self_maps(void *cpu_env, int fd) #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0 [stack]\n", (unsigned long long)ts->info->stack_limit, - (unsigned long long)(ts->stack_base + (TARGET_PAGE_SIZE - 1)) - & TARGET_PAGE_MASK, + (unsigned long long)(ts->info->start_stack + + (TARGET_PAGE_SIZE - 1)) & TARGET_PAGE_MASK, (unsigned long long)0); #endif |