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 handling of iovec counts 

In the kernel the length of an iovec is generally handled as
an unsigned long, not an integer; fix the parameter to
lock_iovec() accordingly.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-15 14:57:26 +01:00 committed by Riku Voipio
parent a008535b9f
commit dab32b321f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/syscall.c
View File

@ -3119,7 +3119,7 @@ static abi_long do_getsockopt(int sockfd, int level, int optname,
} }
static struct iovec *lock_iovec(int type, abi_ulong target_addr, static struct iovec *lock_iovec(int type, abi_ulong target_addr,
int count, int copy) abi_ulong count, int copy)
{ {
struct target_iovec *target_vec; struct target_iovec *target_vec;
struct iovec *vec; struct iovec *vec;
@ -3132,7 +3132,7 @@ static struct iovec *lock_iovec(int type, abi_ulong target_addr,
errno = 0; errno = 0;
return NULL; return NULL;
} }
if (count < 0 || count > IOV_MAX) { if (count > IOV_MAX) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }
@ -3207,7 +3207,7 @@ static struct iovec *lock_iovec(int type, abi_ulong target_addr,
} }
static void unlock_iovec(struct iovec *vec, abi_ulong target_addr, static void unlock_iovec(struct iovec *vec, abi_ulong target_addr,
int count, int copy) abi_ulong count, int copy)
{ {
struct target_iovec *target_vec; struct target_iovec *target_vec;
int i; int i;
@ -3462,7 +3462,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
{ {
abi_long ret, len; abi_long ret, len;
struct msghdr msg; struct msghdr msg;
int count; abi_ulong count;
struct iovec *vec; struct iovec *vec;
abi_ulong target_vec; abi_ulong target_vec;