diff options
| author | Nicolas Surbayrole | 2021-03-08 10:19:59 +0100 |
|---|---|---|
| committer | Laurent Vivier | 2021-03-13 10:45:11 +0100 |
| commit | 08f3a96b33e7eef39b651af9edb5e6de8ff13371 (patch) | |
| tree | 3741935752a9da2acd90a5d0a85af8e54f8a930c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210311-pull-request' i... (diff) | |
| download | qemu-08f3a96b33e7eef39b651af9edb5e6de8ff13371.tar.gz qemu-08f3a96b33e7eef39b651af9edb5e6de8ff13371.tar.xz qemu-08f3a96b33e7eef39b651af9edb5e6de8ff13371.zip | |
linux-user: Fix executable page of /proc/self/maps
The guest binary and libraries are not always map with the
executable bit in the host process. The guest may read a
/proc/self/maps with no executable address range. The
perm fields should be based on the guest permission inside
Qemu.
Signed-off-by: Nicolas Surbayrole <nsurbayrole@quarkslab.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210308091959.986540-1-nsurbayrole@quarkslab.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/syscall.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9522f603aa..1e508576c7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7890,9 +7890,9 @@ static int open_self_maps(void *cpu_env, int fd) count = dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr " %c%c%c%c %08" PRIx64 " %s %"PRId64, h2g(min), h2g(max - 1) + 1, - e->is_read ? 'r' : '-', - e->is_write ? 'w' : '-', - e->is_exec ? 'x' : '-', + (flags & PAGE_READ) ? 'r' : '-', + (flags & PAGE_WRITE_ORG) ? 'w' : '-', + (flags & PAGE_EXEC) ? 'x' : '-', e->is_priv ? 'p' : '-', (uint64_t) e->offset, e->dev, e->inode); if (path) { |