From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWRL-00036o-3Q for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:09:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKWRH-0003Fz-Th for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:09:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWRH-0003Fs-Mw for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:09:31 -0400 From: Stefan Hajnoczi Date: Tue, 26 Mar 2013 17:07:52 +0100 Message-Id: <1364314072-2474-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1364314072-2474-1-git-send-email-stefanha@redhat.com> References: <1364314072-2474-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Juan Quintela , mprivozn@redhat.com, Corey Bryant , david.pravec@nethost.cz, Stefan Hajnoczi When we receive a file descriptor over a UNIX domain socket the O_NONBLOCK flag is preserved. Clear the O_NONBLOCK flag and rely on QEMU file descriptor users like migration, SPICE, VNC, block layer, and others to set non-blocking only when necessary. This change ensures we don't accidentally expose O_NONBLOCK in the QMP API. QMP clients should not need to get the non-blocking state "correct". A recent real-world example was when libvirt passed a non-blocking TCP socket for migration where we expected a blocking socket. The source QEMU produced a corrupted migration stream since its code did not cope with non-blocking sockets. Signed-off-by: Stefan Hajnoczi --- qemu-char.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 8fb8340..e50b1b3 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2407,6 +2407,9 @@ static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg) if (fd < 0) continue; + /* O_NONBLOCK is preserved across SCM_RIGHTS so reset it */ + qemu_set_block(fd); + #ifndef MSG_CMSG_CLOEXEC qemu_set_cloexec(fd); #endif -- 1.8.1.4