mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 11:23:43 +08:00
linux-user: pass correct host flags to accept4()
Flags NONBLOCK and CLOEXEC can have different values on the host and the guest, so set correct host values before calling accept4(). This fixes several issues with accept4 system call and user-mode of QEMU. Signed-off-by: Petar Jovanovic <petar.jovanovic@imgtec.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
parent
63678e17cf
commit
d25295d4ef
@ -2062,9 +2062,12 @@ static abi_long do_accept4(int fd, abi_ulong target_addr,
|
||||
socklen_t addrlen;
|
||||
void *addr;
|
||||
abi_long ret;
|
||||
int host_flags;
|
||||
|
||||
host_flags = target_to_host_bitmask(flags, fcntl_flags_tbl);
|
||||
|
||||
if (target_addr == 0) {
|
||||
return get_errno(accept4(fd, NULL, NULL, flags));
|
||||
return get_errno(accept4(fd, NULL, NULL, host_flags));
|
||||
}
|
||||
|
||||
/* linux returns EINVAL if addrlen pointer is invalid */
|
||||
@ -2080,7 +2083,7 @@ static abi_long do_accept4(int fd, abi_ulong target_addr,
|
||||
|
||||
addr = alloca(addrlen);
|
||||
|
||||
ret = get_errno(accept4(fd, addr, &addrlen, flags));
|
||||
ret = get_errno(accept4(fd, addr, &addrlen, host_flags));
|
||||
if (!is_error(ret)) {
|
||||
host_to_target_sockaddr(target_addr, addr, addrlen);
|
||||
if (put_user_u32(addrlen, target_addrlen_addr))
|
||||
|
Loading…
Reference in New Issue
Block a user