e09eb3e2aa
Update to v4.2.0-rc3. Intent is to submit to Factory, and SLE-15-SP2 as well OBS-URL: https://build.opensuse.org/request/show/751303 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=513
80 lines
3.6 KiB
Diff
80 lines
3.6 KiB
Diff
From: Alexander Graf <agraf@suse.de>
|
|
Date: Tue, 9 Oct 2012 09:06:49 +0200
|
|
Subject: linux-user: use target_ulong
|
|
|
|
Linux syscalls pass pointers or data length or other information of that sort
|
|
to the kernel. This is all stuff you don't want to have sign extended.
|
|
Otherwise a host 64bit variable parameter with a size parameter will extend
|
|
it to a negative number, breaking lseek for example.
|
|
|
|
Pass syscall arguments as ulong always.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
---
|
|
linux-user/qemu.h | 8 ++++----
|
|
linux-user/syscall.c | 18 +++++++++---------
|
|
2 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
|
|
index f6f5fe5fbb553c151cb57146350c..b45b68221434e29636bb34c9f0b0 100644
|
|
--- a/linux-user/qemu.h
|
|
+++ b/linux-user/qemu.h
|
|
@@ -206,10 +206,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
|
|
void target_set_brk(abi_ulong new_brk);
|
|
abi_long do_brk(abi_ulong new_brk);
|
|
void syscall_init(void);
|
|
-abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|
- abi_long arg2, abi_long arg3, abi_long arg4,
|
|
- abi_long arg5, abi_long arg6, abi_long arg7,
|
|
- abi_long arg8);
|
|
+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
|
|
+ abi_ulong arg2, abi_ulong arg3, abi_ulong arg4,
|
|
+ abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
|
|
+ abi_ulong arg8);
|
|
void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
|
|
extern __thread CPUState *thread_cpu;
|
|
void cpu_loop(CPUArchState *env);
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index 243ec2a1e3bde8e6b3ac48989554..61d976cca146a6deb2d74c95ec59 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -7374,10 +7374,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask,
|
|
* of syscall results, can be performed.
|
|
* All errnos that do_syscall() returns must be -TARGET_<errcode>.
|
|
*/
|
|
-static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
|
- abi_long arg2, abi_long arg3, abi_long arg4,
|
|
- abi_long arg5, abi_long arg6, abi_long arg7,
|
|
- abi_long arg8)
|
|
+static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1,
|
|
+ abi_ulong arg2, abi_ulong arg3, abi_ulong arg4,
|
|
+ abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
|
|
+ abi_ulong arg8)
|
|
{
|
|
CPUState *cpu = env_cpu(cpu_env);
|
|
abi_long ret;
|
|
@@ -10125,7 +10125,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
|
*/
|
|
ret = -TARGET_EINVAL;
|
|
if (cpu_isar_feature(aa64_sve, env_archcpu(cpu_env))
|
|
- && arg2 >= 0 && arg2 <= 512 * 16 && !(arg2 & 15)) {
|
|
+ && arg2 <= 512 * 16 && !(arg2 & 15)) {
|
|
CPUARMState *env = cpu_env;
|
|
ARMCPU *cpu = env_archcpu(env);
|
|
uint32_t vq, old_vq;
|
|
@@ -12116,10 +12116,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
|
return ret;
|
|
}
|
|
|
|
-abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|
- abi_long arg2, abi_long arg3, abi_long arg4,
|
|
- abi_long arg5, abi_long arg6, abi_long arg7,
|
|
- abi_long arg8)
|
|
+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
|
|
+ abi_ulong arg2, abi_ulong arg3, abi_ulong arg4,
|
|
+ abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
|
|
+ abi_ulong arg8)
|
|
{
|
|
CPUState *cpu = env_cpu(cpu_env);
|
|
abi_long ret;
|