1 diff -ur qemu-8.0.3.orig/linux-user/syscall.c qemu-8.0.3/linux-user/syscall.c
2 --- qemu-8.0.3.orig/linux-user/syscall.c 2023-07-22 14:27:06.999503109 +0200
3 +++ qemu-8.0.3/linux-user/syscall.c 2023-07-22 15:21:31.161543522 +0200
6 safe_syscall5(int, waitid, idtype_t, idtype, id_t, id, siginfo_t *, infop, \
7 int, options, struct rusage *, rusage)
8 +safe_syscall3(int, execve, const char *, filename, char **, argv, char **, envp)
9 safe_syscall5(int, execveat, int, dirfd, const char *, filename,
10 char **, argv, char **, envp, int, flags)
11 #if defined(TARGET_NR_select) || defined(TARGET_NR__newselect) || \
13 return safe_openat(dirfd, path(pathname), flags, mode);
16 -static int do_execveat(CPUArchState *cpu_env, int dirfd,
17 - abi_long pathname, abi_long guest_argp,
18 - abi_long guest_envp, int flags)
19 +static int do_execv(CPUArchState *cpu_env, int dirfd,
20 + abi_long pathname, abi_long guest_argp,
21 + abi_long guest_envp, int flags, bool is_execveat)
25 @@ -8469,11 +8470,14 @@
29 + const char *exe = p;
30 if (is_proc_myself(p, "exe")) {
31 - ret = get_errno(safe_execveat(dirfd, exec_path, argp, envp, flags));
33 - ret = get_errno(safe_execveat(dirfd, p, argp, envp, flags));
37 + ? safe_execveat(dirfd, exe, argp, envp, flags)
38 + : safe_execve(exe, argp, envp);
39 + ret = get_errno(ret);
41 unlock_user(p, pathname, 0);
46 case TARGET_NR_execveat:
47 - return do_execveat(cpu_env, arg1, arg2, arg3, arg4, arg5);
48 + return do_execv(cpu_env, arg1, arg2, arg3, arg4, arg5, true);
49 case TARGET_NR_execve:
50 - return do_execveat(cpu_env, AT_FDCWD, arg1, arg2, arg3, 0);
51 + return do_execv(cpu_env, AT_FDCWD, arg1, arg2, arg3, 0, false);
53 if (!(p = lock_user_string(arg1)))
54 return -TARGET_EFAULT;