diff options
| author | Fabio Erculiani <lxnay@sabayon.org> | 2012-01-03 09:38:34 +0000 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2012-04-06 18:49:57 +0300 |
| commit | e0e65bee16ae8515315d2bad02e021f3fb5dd236 (patch) | |
| tree | 829f149ad6e7bdcd5f3e60e20f52d9e64cd1d580 /linux-user | |
| parent | 8f8d364f2447e58768132fc10f48a67af371ee38 (diff) | |
| download | qemu-e0e65bee16ae8515315d2bad02e021f3fb5dd236.tar.gz | |
linux-user: improve fake /proc/self/stat making `ps` not segfault.
With the current fake /proc/self/stat implementation `ps` is
segfaulting because it expects to read PID and argv[0] as first and
second field respectively, with the latter being enclosed between
backets.
Reproducing is as easy as running: `ps` inside qemu-user chroot
with /proc mounted.
Signed-off-by: Fabio Erculiani <lxnay@sabayon.org>
Acked-by: Alexander Graf <agraf@suse.de>
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 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9f5e53a7fe..0e74ee05ed 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4662,11 +4662,22 @@ static int open_self_stat(void *cpu_env, int fd) int len; uint64_t val = 0; - if (i == 27) { - /* stack bottom */ - val = start_stack; + if (i == 0) { + /* pid */ + val = getpid(); + snprintf(buf, sizeof(buf), "%"PRId64 " ", val); + } else if (i == 1) { + /* app name */ + snprintf(buf, sizeof(buf), "(%s) ", ts->bprm->argv[0]); + } else if (i == 27) { + /* stack bottom */ + val = start_stack; + snprintf(buf, sizeof(buf), "%"PRId64 " ", val); + } else { + /* for the rest, there is MasterCard */ + snprintf(buf, sizeof(buf), "0%c", i == 43 ? '\n' : ' '); } - snprintf(buf, sizeof(buf), "%"PRId64 "%c", val, i == 43 ? '\n' : ' '); + len = strlen(buf); if (write(fd, buf, len) != len) { return -1; |