[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 4/5] alloca one extra byte sockets
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL for-2.1 4/5] alloca one extra byte sockets |
Date: |
Tue, 15 Jul 2014 17:24:56 +0300 |
From: Joakim Tjernlund <address@hidden>
target_to_host_sockaddr() may increase the lenth with 1 byte
for AF_UNIX sockets so allocate 1 extra byte.
Signed-off-by: Joakim Tjernlund <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7163ade..a50229d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1984,7 +1984,7 @@ static abi_long do_connect(int sockfd, abi_ulong
target_addr,
return -TARGET_EINVAL;
}
- addr = alloca(addrlen);
+ addr = alloca(addrlen+1);
ret = target_to_host_sockaddr(addr, target_addr, addrlen);
if (ret)
@@ -2005,7 +2005,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct
target_msghdr *msgp,
if (msgp->msg_name) {
msg.msg_namelen = tswap32(msgp->msg_namelen);
- msg.msg_name = alloca(msg.msg_namelen);
+ msg.msg_name = alloca(msg.msg_namelen+1);
ret = target_to_host_sockaddr(msg.msg_name, tswapal(msgp->msg_name),
msg.msg_namelen);
if (ret) {
@@ -2268,7 +2268,7 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t
len, int flags,
if (!host_msg)
return -TARGET_EFAULT;
if (target_addr) {
- addr = alloca(addrlen);
+ addr = alloca(addrlen+1);
ret = target_to_host_sockaddr(addr, target_addr, addrlen);
if (ret) {
unlock_user(host_msg, msg, 0);
--
2.0.0
- [Qemu-devel] [PULL for-2.1 0/5] linux-user fixes for 2.1, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 1/5] SIOCGIFINDEX: fix typo, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 4/5] alloca one extra byte sockets,
riku . voipio <=
- [Qemu-devel] [PULL for-2.1 3/5] linux-user: handle AF_PACKET sockaddrs in target_to_host_sockaddr, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 5/5] linux-user: use TARGET_SA_ONSTACK in get_sigframe, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 2/5] qemu-user: Impl. setsockopt(SO_BINDTODEVICE), riku . voipio, 2014/07/15
- Re: [Qemu-devel] [PULL for-2.1 0/5] linux-user fixes for 2.1, Peter Maydell, 2014/07/15