qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fabio Erculiani <lxnay@sabayon.org>
To: riku.voipio@iki.fi
Cc: Fabio Erculiani <lxnay@sabayon.org>,
	qemu-devel@nongnu.org, agraf@suse.de
Subject: [Qemu-devel] [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault.
Date: Tue,  3 Jan 2012 16:43:28 +0100	[thread overview]
Message-ID: <1325605408-16401-1-git-send-email-lxnay@sabayon.org> (raw)

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>
---
 linux-user/syscall.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9ba51bf..f2af5d5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4678,14 +4678,24 @@ 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 */
+        snprintf(buf, sizeof(buf), "%"PRId64 " ", getpid());
+      } 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

             reply	other threads:[~2012-01-03 15:43 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-03 15:43 Fabio Erculiani [this message]
2012-01-03 16:07 ` [Qemu-devel] [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault Fabio Erculiani
2012-01-03 17:41   ` Alexander Graf
2012-01-03 18:04     ` Fabio Erculiani
2012-01-03 18:08       ` Fabio Erculiani
2012-01-03 18:28         ` Alexander Graf
2012-01-03 18:29       ` Alexander Graf
2012-01-03 18:46         ` Fabio Erculiani
2012-01-03 18:52           ` Fabio Erculiani
2012-01-03 18:52           ` Alexander Graf
2012-01-03 18:54             ` Fabio Erculiani
2012-01-03 19:01               ` Alexander Graf
2012-01-03 19:11                 ` Fabio Erculiani
2012-01-03 19:12                   ` Alexander Graf
2012-01-03 19:21                     ` Fabio Erculiani

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325605408-16401-1-git-send-email-lxnay@sabayon.org \
    --to=lxnay@sabayon.org \
    --cc=agraf@suse.de \
    --cc=qemu-devel@nongnu.org \
    --cc=riku.voipio@iki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).