From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1e5f-0006GD-Av for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1e5e-0000Oe-4M for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1e5d-0000OU-Su for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:54 -0400 From: Kevin Wolf Date: Wed, 15 Aug 2012 15:56:34 +0200 Message-Id: <1345039003-19186-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1345039003-19186-1-git-send-email-kwolf@redhat.com> References: <1345039003-19186-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Corey Bryant Set the close-on-exec flag for the file descriptor received via SCM_RIGHTS. Signed-off-by: Corey Bryant Signed-off-by: Kevin Wolf --- qemu-char.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 382c71e..10d1504 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2238,6 +2238,9 @@ static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg) if (fd < 0) continue; +#ifndef MSG_CMSG_CLOEXEC + qemu_set_cloexec(fd); +#endif if (s->msgfd != -1) close(s->msgfd); s->msgfd = fd; @@ -2253,6 +2256,7 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) struct cmsghdr cmsg; char control[CMSG_SPACE(sizeof(int))]; } msg_control; + int flags = 0; ssize_t ret; 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_controllen = sizeof(msg_control); - ret = recvmsg(s->fd, &msg, 0); - if (ret > 0 && s->is_unix) +#ifdef MSG_CMSG_CLOEXEC + flags |= MSG_CMSG_CLOEXEC; +#endif + ret = recvmsg(s->fd, &msg, flags); + if (ret > 0 && s->is_unix) { unix_process_msgfd(chr, &msg); + } return ret; } -- 1.7.6.5