| Message ID | 20200327094945.23768-3-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | A selection of sanitiser fixes | expand |
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 <alex.bennee@linaro.org> > --- > 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 <laurent@vivier.eu>
On 3/27/20 2:49 AM, Alex Bennée wrote: > 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 <alex.bennee@linaro.org> > --- > linux-user/syscall.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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; }
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 <alex.bennee@linaro.org> --- linux-user/syscall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1