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

lock_iovec() fix 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3967 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2008-02-04 22:26:57 +00:00
parent 3fe43da737
commit 41df841110
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
linux-user/syscall.c
View File

@ -1027,9 +1027,14 @@ static abi_long lock_iovec(int type, struct iovec *vec, abi_ulong target_addr,
for(i = 0;i < count; i++) { for(i = 0;i < count; i++) {
base = tswapl(target_vec[i].iov_base); base = tswapl(target_vec[i].iov_base);
vec[i].iov_len = tswapl(target_vec[i].iov_len); vec[i].iov_len = tswapl(target_vec[i].iov_len);
vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy); if (vec[i].iov_len != 0) {
if (!vec[i].iov_base) vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy);
goto fail; if (!vec[i].iov_base)
goto fail;
} else {
/* zero length pointer is ignored */
vec[i].iov_base = NULL;
}
} }
unlock_user (target_vec, target_addr, 0); unlock_user (target_vec, target_addr, 0);
return 0; return 0;
@ -4723,7 +4728,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
struct iovec *vec; struct iovec *vec;
vec = alloca(count * sizeof(struct iovec)); vec = alloca(count * sizeof(struct iovec));
lock_iovec(VERIFY_WRITE, vec, arg2, count, 0); if (lock_iovec(VERIFY_WRITE, vec, arg2, count, 0) < 0)
goto efault;
ret = get_errno(readv(arg1, vec, count)); ret = get_errno(readv(arg1, vec, count));
unlock_iovec(vec, arg2, count, 1); unlock_iovec(vec, arg2, count, 1);
} }
@ -4734,7 +4740,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
struct iovec *vec; struct iovec *vec;
vec = alloca(count * sizeof(struct iovec)); vec = alloca(count * sizeof(struct iovec));
lock_iovec(VERIFY_READ, vec, arg2, count, 1); if (lock_iovec(VERIFY_READ, vec, arg2, count, 1) < 0)
goto efault;
ret = get_errno(writev(arg1, vec, count)); ret = get_errno(writev(arg1, vec, count));
unlock_iovec(vec, arg2, count, 0); unlock_iovec(vec, arg2, count, 0);
} }