mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: fix socklen_t comparisons

Browse Source 
On many systems, socklen_t is defined as unsigned. This means that
checks for negative values are not meaningful.

Fix by explicitly casting to a signed integer.

This also avoids some warnings with GCC flag -Wtype-limits.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-09-18 05:53:14 +00:00
parent 093209cd68
commit 3872425343
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
linux-user/syscall.c
View File

@ -1551,8 +1551,9 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr,
void *addr; void *addr;
abi_long ret; abi_long ret;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
addr = alloca(addrlen+1); addr = alloca(addrlen+1);
@ -1570,8 +1571,9 @@ static abi_long do_connect(int sockfd, abi_ulong target_addr,
void *addr; void *addr;
abi_long ret; abi_long ret;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
addr = alloca(addrlen); addr = alloca(addrlen);
@ -1656,8 +1658,9 @@ static abi_long do_accept(int fd, abi_ulong target_addr,
if (get_user_u32(addrlen, target_addrlen_addr)) if (get_user_u32(addrlen, target_addrlen_addr))
return -TARGET_EINVAL; return -TARGET_EINVAL;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
if (!access_ok(VERIFY_WRITE, target_addr, addrlen)) if (!access_ok(VERIFY_WRITE, target_addr, addrlen))
return -TARGET_EINVAL; return -TARGET_EINVAL;
@ -1684,8 +1687,9 @@ static abi_long do_getpeername(int fd, abi_ulong target_addr,
if (get_user_u32(addrlen, target_addrlen_addr)) if (get_user_u32(addrlen, target_addrlen_addr))
return -TARGET_EFAULT; return -TARGET_EFAULT;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
if (!access_ok(VERIFY_WRITE, target_addr, addrlen)) if (!access_ok(VERIFY_WRITE, target_addr, addrlen))
return -TARGET_EFAULT; return -TARGET_EFAULT;
@ -1712,8 +1716,9 @@ static abi_long do_getsockname(int fd, abi_ulong target_addr,
if (get_user_u32(addrlen, target_addrlen_addr)) if (get_user_u32(addrlen, target_addrlen_addr))
return -TARGET_EFAULT; return -TARGET_EFAULT;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
if (!access_ok(VERIFY_WRITE, target_addr, addrlen)) if (!access_ok(VERIFY_WRITE, target_addr, addrlen))
return -TARGET_EFAULT; return -TARGET_EFAULT;
@ -1753,8 +1758,9 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t len, int flags,
void *host_msg; void *host_msg;
abi_long ret; abi_long ret;
if (addrlen < 0) if ((int)addrlen < 0) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
}
host_msg = lock_user(VERIFY_READ, msg, len, 1); host_msg = lock_user(VERIFY_READ, msg, len, 1);
if (!host_msg) if (!host_msg)
@ -1792,7 +1798,7 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags,
ret = -TARGET_EFAULT; ret = -TARGET_EFAULT;
goto fail; goto fail;
} }
if (addrlen < 0) { if ((int)addrlen < 0) {
ret = -TARGET_EINVAL; ret = -TARGET_EINVAL;
goto fail; goto fail;
} }