From patchwork Thu Apr 4 14:18:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 233841 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 32EE22C009B for ; Fri, 5 Apr 2013 01:19:38 +1100 (EST) Received: from localhost ([::1]:47622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNl0q-0000iG-DG for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 10:19:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNl0G-0000Qp-5y for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:19:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNl09-0006Ih-SZ for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:19:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNl09-0006Hk-L3 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:18:53 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r34EIiDH008173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Apr 2013 10:18:44 -0400 Received: from localhost (ovpn-112-26.ams2.redhat.com [10.36.112.26]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r34EIh9p014705; Thu, 4 Apr 2013 10:18:44 -0400 From: Stefan Hajnoczi To: Date: Thu, 4 Apr 2013 16:18:31 +0200 Message-Id: <1365085111-17027-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1365085111-17027-1-git-send-email-stefanha@redhat.com> References: <1365085111-17027-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Markus Armbruster , Michael Roth , Stefan Hajnoczi , Luiz Capitulino Subject: [Qemu-devel] [PATCH stable-1.4 v2 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 (cherry picked from commit e374f7f816171f9783c1d9d00a041f26379f1ac6) 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 d685139..1efca64 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2252,6 +2252,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