From: Laurent Vivier <laurent@vivier.eu>
Date: Tue, 27 Sep 2022 12:43:56 +0000 (+0200)
Subject: linux-user: handle /proc/self/exe with execve() syscall
X-Git-Tag: v7.2.0-rc0~41^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f07eb1c4f805c0dcc14dd69fee49b601ce0b2d2c;p=thirdparty%2Fqemu.git

linux-user: handle /proc/self/exe with execve() syscall

If path is /proc/self/exe, use the executable path
provided by exec_path.

Don't use execfd as it is closed by loader_exec() and otherwise
will survive to the exec() syscall and be usable child process.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220927124357.688536-2-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ad06ec7bd54..a7a29091c91 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8860,7 +8860,11 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
              * before the execve completes and makes it the other
              * program's problem.
              */
-            ret = get_errno(safe_execve(p, argp, envp));
+            if (is_proc_myself(p, "exe")) {
+                ret = get_errno(safe_execve(exec_path, argp, envp));
+            } else {
+                ret = get_errno(safe_execve(p, argp, envp));
+            }
             unlock_user(p, arg1, 0);
 
             goto execve_end;