[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/17] linux-user: improve fake /proc/self/stat maki
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 01/17] linux-user: improve fake /proc/self/stat making `ps` not segfault. |
Date: |
Fri, 6 Apr 2012 19:35:01 +0300 |
From: Fabio Erculiani <address@hidden>
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 <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
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 9f5e53a..0e74ee0 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;
--
1.7.5.4
- [Qemu-devel] [PATCH 14/17] linux-user/arm/syscall_nr.h: Add syscall number for ppoll, (continued)
- [Qemu-devel] [PATCH 14/17] linux-user/arm/syscall_nr.h: Add syscall number for ppoll, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 10/17] linux-user: resolve reserved_va vma downwards, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 16/17] elf.h: Update EF_ARM_ constants to newer ABI versions, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 12/17] linux-user/syscall.c: Fix indentation in prctl handling, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 03/17] linux-user: implement device mapper ioctls, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 15/17] arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features., riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 13/17] linux-user: Add support for prctl PR_GET_NAME and PR_SET_NAME, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 08/17] linux-user: fix fallocate, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 02/17] linux-user: target_argv is placed on ts->bprm->argv and can't be freed(), riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 05/17] linux-user: fix BLK ioctl arguments, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 01/17] linux-user: improve fake /proc/self/stat making `ps` not segfault.,
riku . voipio <=
- [Qemu-devel] [PATCH 04/17] linux-user: add struct old_dev_t compat, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 11/17] linux-user: reserve 4GB of vmem for 32-on-64, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 17/17] Userspace ARM BE8 support, riku . voipio, 2012/04/06
- [Qemu-devel] [PATCH 07/17] linux-user: Add ioctl for BLKBSZGET, riku . voipio, 2012/04/06
- Re: [Qemu-devel] [PATCH 00/17] linux-user: pending patches, Blue Swirl, 2012/04/07