ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: fix emulation of splice syscall 

The second and fourth argument are in/out parameters, store them back
after the syscall.  Also, the fourth argument was mishandled, and EFAULT
handling was missing.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Andreas Schwab 2015-03-10 17:11:35 +01:00 committed by Riku Voipio
parent 92bed463d1
commit 17644b3627
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linux-user/syscall.c
View File

@ -9351,15 +9351,29 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
{
loff_t loff_in, loff_out;
loff_t *ploff_in = NULL, *ploff_out = NULL;
if(arg2) {
get_user_u64(loff_in, arg2);
if (arg2) {
if (get_user_u64(loff_in, arg2)) {
goto efault;
}
ploff_in = &loff_in;
}
if(arg4) {
get_user_u64(loff_out, arg2);
if (arg4) {
if (get_user_u64(loff_out, arg4)) {
goto efault;
}
ploff_out = &loff_out;
}
ret = get_errno(splice(arg1, ploff_in, arg3, ploff_out, arg5, arg6));
if (arg2) {
if (put_user_u64(loff_in, arg2)) {
goto efault;
}
}
if (arg4) {
if (put_user_u64(loff_out, arg4)) {
goto efault;
}
}
}
break;
#endif