[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef |
Date: |
Fri, 27 Mar 2020 11:40:21 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 |
Le 27/03/2020 à 10:49, Alex Bennée a écrit :
> Checking TARGET_ABI_BITS is sketchy - we should check for the presence
> of the define to be sure. Also clean up the white space while we are
> there.
>
> Signed-off-by: Alex Bennée <address@hidden>
> ---
> linux-user/syscall.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 49395dcea97..a3da46d69f9 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -11223,11 +11223,11 @@ static abi_long do_syscall1(void *cpu_env, int num,
> abi_long arg1,
> This is a hint, so ignoring and returning success is ok. */
> return 0;
> #endif
> -#if TARGET_ABI_BITS == 32
> +#ifdef TARGET_NR_fcntl64
> case TARGET_NR_fcntl64:
> {
> - int cmd;
> - struct flock64 fl;
> + int cmd;
> + struct flock64 fl;
> from_flock64_fn *copyfrom = copy_from_user_flock64;
> to_flock64_fn *copyto = copy_to_user_flock64;
>
> @@ -11238,7 +11238,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
> abi_long arg1,
> }
> #endif
>
> - cmd = target_to_host_fcntl_cmd(arg2);
> + cmd = target_to_host_fcntl_cmd(arg2);
> if (cmd == -TARGET_EINVAL) {
> return cmd;
> }
>
Reviewed-by: Laurent Vivier <address@hidden>
- [PATCH for 5.0 v1 0/7] A selection of sanitiser fixes, Alex Bennée, 2020/03/27
- [PATCH v1 1/7] elf-ops: bail out if we have no function symbols, Alex Bennée, 2020/03/27
- [PATCH v1 3/7] tests/tcg: remove extraneous pasting macros, Alex Bennée, 2020/03/27
- [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef, Alex Bennée, 2020/03/27
- [PATCH v1 4/7] linux-user: more debug for init_guest_space, Alex Bennée, 2020/03/27
- [PATCH v1 6/7] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/03/27
- [PATCH v1 5/7] fpu/softfloat: avoid undefined behaviour when normalising empty sigs, Alex Bennée, 2020/03/27
- Re: [PATCH v1 5/7] fpu/softfloat: avoid undefined behaviour when normalising empty sigs, Aleksandar Markovic, 2020/03/27