From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNiWr-00008u-Ue for qemu-devel@nongnu.org; Thu, 04 Apr 2013 07:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNiWp-0004pB-Ao for qemu-devel@nongnu.org; Thu, 04 Apr 2013 07:40:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNiWp-0004ok-32 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 07:40:27 -0400 From: Stefan Hajnoczi Date: Thu, 4 Apr 2013 13:40:13 +0200 Message-Id: <1365075615-14027-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1365075615-14027-1-git-send-email-stefanha@redhat.com> References: <1365075615-14027-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH stable-1.4 2/4] net: ensure "socket" backend uses non-blocking fds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Roth , Stefan Hajnoczi , Luiz Capitulino There are several code paths in net_init_socket() depending on how the socket is created: file descriptor passing, UDP multicast, TCP, or UDP. Some of these support both listen and connect. Not all code paths set the socket to non-blocking. This patch addresses the file descriptor passing and UDP cases which were missing socket_set_nonblock(fd) calls. I considered moving socket_set_nonblock(fd) to a central location but it turns out the code paths are different enough to require non-blocking at different places. Signed-off-by: Stefan Hajnoczi --- net/socket.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/socket.c b/net/socket.c index ea407c7..a2b94f4 100644 --- a/net/socket.c +++ b/net/socket.c @@ -672,6 +672,7 @@ static int net_socket_udp_init(NetClientState *peer, closesocket(fd); return -1; } + qemu_set_nonblock(fd); s = net_socket_fd_init(peer, model, name, fd, 0); if (!s) { @@ -710,7 +711,11 @@ int net_init_socket(const NetClientOptions *opts, const char *name, int fd; fd = monitor_handle_fd_param(cur_mon, sock->fd); - if (fd == -1 || !net_socket_fd_init(peer, "socket", name, fd, 1)) { + if (fd == -1) { + return -1; + } + qemu_set_nonblock(fd); + if (!net_socket_fd_init(peer, "socket", name, fd, 1)) { return -1; } return 0; -- 1.8.1.4