From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSzfm-0006Ai-8G for qemu-devel@nongnu.org; Fri, 30 Jan 2009 15:09:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSzfl-0006AP-JF for qemu-devel@nongnu.org; Fri, 30 Jan 2009 15:09:05 -0500 Received: from [199.232.76.173] (port=47774 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSzfl-0006AC-AJ for qemu-devel@nongnu.org; Fri, 30 Jan 2009 15:09:05 -0500 Received: from savannah.gnu.org ([199.232.41.3]:60216 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSzfk-0007jO-Aa for qemu-devel@nongnu.org; Fri, 30 Jan 2009 15:09:04 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LSzfi-0004P5-Fj for qemu-devel@nongnu.org; Fri, 30 Jan 2009 20:09:02 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LSzfi-0004P0-60 for qemu-devel@nongnu.org; Fri, 30 Jan 2009 20:09:02 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Fri, 30 Jan 2009 20:09:02 +0000 Subject: [Qemu-devel] [6485] 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 Revision: 6485 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6485 Author: aurel32 Date: 2009-01-30 20:09:01 +0000 (Fri, 30 Jan 2009) Log Message: ----------- linux-user: identify running binary in /proc/self/exe Some applications like to test /proc/self/exe to find out who they are. Fake the result of readlink() for them. Use realpath() to return full path to binary (which the links /proc/self/exe are) Signed-off-by: Riku Voipio Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/linux-user/main.c trunk/linux-user/qemu.h trunk/linux-user/syscall.c Modified: trunk/linux-user/main.c =================================================================== --- trunk/linux-user/main.c 2009-01-30 19:59:17 UTC (rev 6484) +++ trunk/linux-user/main.c 2009-01-30 20:09:01 UTC (rev 6485) @@ -37,6 +37,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; @@ -2341,6 +2343,7 @@ if (optind >= argc) usage(); filename = argv[optind]; + exec_path = argv[optind]; /* Zero out regs */ memset(regs, 0, sizeof(struct target_pt_regs)); Modified: trunk/linux-user/qemu.h =================================================================== --- trunk/linux-user/qemu.h 2009-01-30 19:59:17 UTC (rev 6484) +++ trunk/linux-user/qemu.h 2009-01-30 20:09:01 UTC (rev 6485) @@ -120,6 +120,7 @@ uint8_t stack[0]; } __attribute__((aligned(16))) TaskState; +extern char *exec_path; void init_task_state(TaskState *ts); extern const char *qemu_uname_release; Modified: trunk/linux-user/syscall.c =================================================================== --- trunk/linux-user/syscall.c 2009-01-30 19:59:17 UTC (rev 6484) +++ trunk/linux-user/syscall.c 2009-01-30 20:09:01 UTC (rev 6485) @@ -4410,13 +4410,22 @@ #endif case TARGET_NR_readlink: { - void *p2; + void *p2, *temp; p = lock_user_string(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) { + char real[PATH_MAX]; + temp = realpath(exec_path,real); + ret = (temp==NULL) ? get_errno(-1) : strlen(real) ; + snprintf((char *)p2, arg3, "%s", real); + } + else + ret = get_errno(readlink(path(p), p2, arg3)); + break; + } unlock_user(p2, arg2, ret); unlock_user(p, arg1, 0); }