From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ri9uX-0005lE-Oc for qemu-devel@nongnu.org; Tue, 03 Jan 2012 14:20:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ri9uW-0003Jf-EY for qemu-devel@nongnu.org; Tue, 03 Jan 2012 14:20:37 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:37786) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ri9uW-0003JX-A8 for qemu-devel@nongnu.org; Tue, 03 Jan 2012 14:20:36 -0500 Received: by eekb45 with SMTP id b45so18961846eek.4 for ; Tue, 03 Jan 2012 11:20:35 -0800 (PST) Sender: Fabio Erculiani From: Fabio Erculiani Date: Tue, 3 Jan 2012 20:20:22 +0100 Message-Id: <1325618423-1181-1-git-send-email-lxnay@sabayon.org> Subject: [Qemu-devel] [PATCH v2 1/2] linux-user: improve fake /proc/self/stat making `ps` not segfault. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fabio Erculiani , riku.voipio@iki.fi, agraf@suse.de 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 --- linux-user/syscall.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9ba51bf..e563c00 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4678,14 +4678,25 @@ 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; + return -1; } } -- 1.7.7