diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-02-16 17:39:35 +0100 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2015-02-16 17:44:01 +0100 |
| commit | 065b007a1b3c516b3c7f12c360dd2dcdeb4ac0c8 (patch) | |
| tree | ffad5f2ea27e808440292b171943692596dfb26d | |
| parent | 77f41a5cae59c0faa5384af809649f42e6667144 (diff) | |
| download | qemu-accepted/tizen_3.0.2014.q4_common.tar.gz qemu-accepted/tizen_3.0.2014.q4_common.tar.bz2 qemu-accepted/tizen_3.0.2014.q4_common.zip | |
Fix emulation of splice syscalltizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_wearable/20150227.104204submit/tizen_tv/20150319.052230submit/tizen_mobile/20150319.052340submit/tizen_common/20150223.083300submit/tizen_3.0.2014.q4_common/20150224.000000submit/tizen/20151208.013156accepted/tizen/wearable/20151208.124740accepted/tizen/wearable/20150227.104320accepted/tizen/tv/20151208.124730accepted/tizen/tv/20150319.091859accepted/tizen/mobile/20151208.124709accepted/tizen/mobile/20150319.092022accepted/tizen/common/20150223.141054accepted/tizen/3.0.2014.q4/common/20150224.150711tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commonaccepted/tizen_3.0.2014.q4_common
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.
Change-Id: I625ecd4dc3e53b8025585727439f1112c38d1758
Patch-Url: https://www.mail-archive.com/qemu-devel@nongnu.org/msg277687.html
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | linux-user/syscall.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a08f5efb0..52885ab05 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9489,14 +9489,24 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, loff_t loff_in, loff_out; loff_t *ploff_in = NULL, *ploff_out = NULL; if(arg2) { - get_user_u64(loff_in, 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 |