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

qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg

Browse Source 
Set the close-on-exec flag for the file descriptor received
via SCM_RIGHTS.

Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Corey Bryant 2012-08-14 16:43:42 -04:00 committed by Kevin Wolf
parent 03834e22ab
commit 06138651f3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qemu-char.c
View File

@ -2238,6 +2238,9 @@ static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg)
if (fd < 0) if (fd < 0)
continue; continue;
#ifndef MSG_CMSG_CLOEXEC
qemu_set_cloexec(fd);
#endif
if (s->msgfd != -1) if (s->msgfd != -1)
close(s->msgfd); close(s->msgfd);
s->msgfd = fd; s->msgfd = fd;
@ -2253,6 +2256,7 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
struct cmsghdr cmsg; struct cmsghdr cmsg;
char control[CMSG_SPACE(sizeof(int))]; char control[CMSG_SPACE(sizeof(int))];
} msg_control; } msg_control;
int flags = 0;
ssize_t ret; ssize_t ret;
iov[0].iov_base = buf; iov[0].iov_base = buf;
@ -2263,9 +2267,13 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
msg.msg_control = &msg_control; msg.msg_control = &msg_control;
msg.msg_controllen = sizeof(msg_control); msg.msg_controllen = sizeof(msg_control);
ret = recvmsg(s->fd, &msg, 0); #ifdef MSG_CMSG_CLOEXEC
if (ret > 0 && s->is_unix) flags |= MSG_CMSG_CLOEXEC;
#endif
ret = recvmsg(s->fd, &msg, flags);
if (ret > 0 && s->is_unix) {
unix_process_msgfd(chr, &msg); unix_process_msgfd(chr, &msg);
}
return ret; return ret;
} }