提交 8ec7368c 编写于 作者: P Peter Maydell 提交者: Michael Roth

linux-user: make pwrite64/pread64(fd, NULL, 0, offset) return 0

Linux returns success if pwrite64() or pread64() are called with a
zero length NULL buffer, but QEMU was returning -TARGET_EFAULT.

This is the same bug that we fixed in commit 58cfa6c2
for the write syscall, and long before that in 38d840e6
for the read syscall.

Fixes: https://bugs.launchpad.net/qemu/+bug/1810433Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: NLaurent Vivier <laurent@vivier.eu>
Reviewed-by: NPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190108184900.9654-1-peter.maydell@linaro.org>
Signed-off-by: NLaurent Vivier <laurent@vivier.eu>
(cherry picked from commit 2bd3f899)
Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
上级 85bfce13
...@@ -9677,8 +9677,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, ...@@ -9677,8 +9677,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
arg4 = arg5; arg4 = arg5;
arg5 = arg6; arg5 = arg6;
} }
if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0))) if (arg2 == 0 && arg3 == 0) {
return -TARGET_EFAULT; /* Special-case NULL buffer and zero length, which should succeed */
p = 0;
} else {
p = lock_user(VERIFY_WRITE, arg2, arg3, 0);
if (!p) {
return -TARGET_EFAULT;
}
}
ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5))); ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, ret); unlock_user(p, arg2, ret);
return ret; return ret;
...@@ -9687,8 +9694,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, ...@@ -9687,8 +9694,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
arg4 = arg5; arg4 = arg5;
arg5 = arg6; arg5 = arg6;
} }
if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1))) if (arg2 == 0 && arg3 == 0) {
return -TARGET_EFAULT; /* Special-case NULL buffer and zero length, which should succeed */
p = 0;
} else {
p = lock_user(VERIFY_READ, arg2, arg3, 1);
if (!p) {
return -TARGET_EFAULT;
}
}
ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5))); ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册