From 07726f522deea2b98f39f7acdd32c60a35d65d1a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 1 Mar 2024 14:52:30 -1000 Subject: linux-user: Implement PR_{GET,SET}_CHILD_SUBREAPER The "set" prctl passes through integral values. The "get" prctl returns the value into a pointer. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1929 Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/syscall.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'linux-user/syscall.c') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 597bdf0c2d..0801ae124d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6450,11 +6450,21 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, case PR_SET_NO_NEW_PRIVS: case PR_GET_IO_FLUSHER: case PR_SET_IO_FLUSHER: + case PR_SET_CHILD_SUBREAPER: /* Some prctl options have no pointer arguments and we can pass on. */ return get_errno(prctl(option, arg2, arg3, arg4, arg5)); case PR_GET_CHILD_SUBREAPER: - case PR_SET_CHILD_SUBREAPER: + { + int val; + ret = get_errno(prctl(PR_GET_CHILD_SUBREAPER, &val, + arg3, arg4, arg5)); + if (!is_error(ret) && put_user_s32(val, arg2)) { + return -TARGET_EFAULT; + } + return ret; + } + case PR_GET_SPECULATION_CTRL: case PR_SET_SPECULATION_CTRL: case PR_GET_TID_ADDRESS: -- cgit 1.4.1 From 91511bd40f9a425a99717db14bb46f50f8979cbe Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 1 Mar 2024 14:56:45 -1000 Subject: linux-user: Implement PR_{GET,SET}_SPECULATION_CTRL Both of these only pass and return integral values. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/syscall.c') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0801ae124d..4871c4b648 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6451,6 +6451,8 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, case PR_GET_IO_FLUSHER: case PR_SET_IO_FLUSHER: case PR_SET_CHILD_SUBREAPER: + case PR_GET_SPECULATION_CTRL: + case PR_SET_SPECULATION_CTRL: /* Some prctl options have no pointer arguments and we can pass on. */ return get_errno(prctl(option, arg2, arg3, arg4, arg5)); @@ -6465,8 +6467,6 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, return ret; } - case PR_GET_SPECULATION_CTRL: - case PR_SET_SPECULATION_CTRL: case PR_GET_TID_ADDRESS: /* TODO */ return -TARGET_EINVAL; -- cgit 1.4.1 From 8de24b15630a9b2d474be593289c8bf54dacd50a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 1 Mar 2024 15:04:39 -1000 Subject: linux-user: Implement PR_GET_TID_ADDRESS Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'linux-user/syscall.c') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 4871c4b648..e12d969c2e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6468,8 +6468,10 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, } case PR_GET_TID_ADDRESS: - /* TODO */ - return -TARGET_EINVAL; + { + TaskState *ts = env_cpu(env)->opaque; + return put_user_ual(ts->child_tidptr, arg2); + } case PR_GET_FPEXC: case PR_SET_FPEXC: -- cgit 1.4.1