44bce8debe
- add fixes for reserved_va mmap(NULL) case, fixes git build on arm OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=59
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 9a72708a58d7bcbc1ba036a44cea920a238b0312 Mon Sep 17 00:00:00 2001
|
|
From: Fabio Erculiani <lxnay@sabayon.org>
|
|
Date: Tue, 3 Jan 2012 09:38:34 +0000
|
|
Subject: [PATCH] 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>
|
|
---
|
|
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 9ba51bf..3e8e3dd 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -4678,11 +4678,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;
|