From patchwork Tue Mar 26 16:07:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 231425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB6852C00B0 for ; Wed, 27 Mar 2013 03:10:04 +1100 (EST) Received: from localhost ([::1]:37327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWRl-0003DF-R9 for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 12:10:01 -0400 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QG86Sg003852 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Mar 2013 12:08:06 -0400 Received: from localhost (ovpn-112-22.ams2.redhat.com [10.36.112.22]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2QG85Cd011430; Tue, 26 Mar 2013 12:08:06 -0400 From: Stefan Hajnoczi To: 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Juan Quintela , mprivozn@redhat.com, Corey Bryant , david.pravec@nethost.cz, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/4] chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Juan Quintela Reviewed-by: Eric Blake --- 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