From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LOw4t-000706-US for qemu-devel@nongnu.org; Mon, 19 Jan 2009 10:30:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LOw4t-0006zT-2I for qemu-devel@nongnu.org; Mon, 19 Jan 2009 10:30:15 -0500 Received: from [199.232.76.173] (port=54933 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LOw4s-0006zJ-Rx for qemu-devel@nongnu.org; Mon, 19 Jan 2009 10:30:14 -0500 Received: from [84.20.150.76] (port=44554 helo=narury.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LOw4s-0006YY-BB for qemu-devel@nongnu.org; Mon, 19 Jan 2009 10:30:14 -0500 Received: from kos.to (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by narury.org (Postfix) with ESMTP id EB3BD3274001 for ; Mon, 19 Jan 2009 17:30:08 +0200 (EET) Date: Mon, 19 Jan 2009 17:30:08 +0200 From: Riku Voipio Message-ID: <20090119153008.GA20882@kos.to> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] linux-user: identify running binary in /proc/self/exe Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Some applications like to test /proc/self/exe to find out who they are. Fake the result of readlink() for them. Signed-off-by: Riku Voipio --- linux-user/main.c | 3 +++ linux-user/qemu.h | 1 + linux-user/syscall.c | 9 +++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 3019f33..2ffe244 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -34,6 +34,8 @@ #define DEBUG_LOGFILE "/tmp/qemu.log" +char *exec_path; + static const char *interp_prefix = CONFIG_QEMU_PREFIX; const char *qemu_uname_release = CONFIG_UNAME_RELEASE; @@ -2314,6 +2316,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) usage(); filename = argv[optind]; + exec_path = argv[optind]; /* Zero out regs */ memset(regs, 0, sizeof(struct target_pt_regs)); diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 9fddd05..4137567 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -120,6 +120,7 @@ typedef struct TaskState { uint8_t stack[0]; } __attribute__((aligned(16))) TaskState; +extern char *exec_path; void init_task_state(TaskState *ts); extern const char *qemu_uname_release; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index adb27de..53167e9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4720,8 +4720,13 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0); if (!p || !p2) ret = -TARGET_EFAULT; - else - ret = get_errno(readlink(path(p), p2, arg3)); + else { + if (strncmp((const char *)p, "/proc/self/exe", 14) == 0) + ret = get_errno(snprintf((char *)p2, arg3, "%s", exec_path)); + else + ret = get_errno(readlink(path(p), p2, arg3)); + break; + } unlock_user(p2, arg2, ret); unlock_user(p, arg1, 0); } -- 1.5.6.5 -- "rm -rf" only sounds scary if you don't have backups