Karim Taha <kariem.taha...@gmail.com> wrote:
This mistakenly has a `Reviewed-by` line, this is from v2 of the series
when I thought the implementation was correct, before you replied to
me on v1 series thread that IPC_SET does not need the VERIFY_WRITE,
I'm writing this so you know why I will remove it in v4.
> From: Stacey Son <s...@freebsd.org>
>
> Signed-off-by: Stacey Son <s...@freebsd.org>
> Signed-off-by: Karim Taha <kariem.taha...@gmail.com>
>
> Reviewed-by: Warner Losh <i...@bsdimp.com>
> ---
> bsd-user/bsd-mem.h | 39 +++++++++++++++++++++++++++++++++++
> bsd-user/freebsd/os-syscall.c | 4 ++++
> 2 files changed, 43 insertions(+)
>
> diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
> index 27d4e7f079..68f34b5d36 100644
> --- a/bsd-user/bsd-mem.h
> +++ b/bsd-user/bsd-mem.h
> @@ -304,4 +304,43 @@ static inline abi_long do_bsd_shmget(abi_long arg1,
> abi_ulong arg2,
> return get_errno(shmget(arg1, arg2, arg3));
> }
>
> +/* shmctl(2) */
> +static inline abi_long do_bsd_shmctl(abi_long shmid, abi_long cmd,
> + abi_ulong buff)
> +{
> + struct shmid_ds dsarg;
> + abi_long ret = -TARGET_EINVAL;
> +
> + cmd &= 0xff;
> +
> + switch (cmd) {
> + case IPC_STAT:
> + if (target_to_host_shmid_ds(&dsarg, buff)) {
> + return -TARGET_EFAULT;
> + }
> + ret = get_errno(shmctl(shmid, cmd, &dsarg));
> + if (host_to_target_shmid_ds(buff, &dsarg)) {
> + return -TARGET_EFAULT;
> + }
> + break;
> +
> + case IPC_SET:
> + if (target_to_host_shmid_ds(&dsarg, buff)) {
> + return -TARGET_EFAULT;
> + }
> + ret = get_errno(shmctl(shmid, cmd, &dsarg));
> + break;
> +
> + case IPC_RMID:
> + ret = get_errno(shmctl(shmid, cmd, NULL));
> + break;
> +
> + default:
> + ret = -TARGET_EINVAL;
> + break;
> + }
> +
> + return ret;
> +}
> +
> #endif /* BSD_USER_BSD_MEM_H */
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index 52cca2300f..35f94f51fc 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -555,6 +555,10 @@ static abi_long freebsd_syscall(void *cpu_env, int num,
> abi_long arg1,
> ret = do_bsd_shmget(arg1, arg2, arg3);
> break;
>
> + case TARGET_FREEBSD_NR_shmctl: /* shmctl(2) */
> + ret = do_bsd_shmctl(arg1, arg2, arg3);
> + break;
> +
> /*
> * Misc
> */
> --
> 2.42.0
