From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z7y-0005RQ-KQ for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z75-0001Pg-RD for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:24:26 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:59550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z75-0001PX-Ll for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:23:31 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 13:23:31 -0400 From: Michael Roth Date: Tue, 8 Jul 2014 12:19:01 -0500 Message-Id: <1404839947-1086-151-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 150/156] nbd: Close socket on negotiation failure. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Hani Benhabiles Otherwise, the nbd client may hang waiting for the server response. Signed-off-by: Hani Benhabiles Acked-by: Paolo Bonzini Signed-off-by: Michael Tokarev (cherry picked from commit 36af599417dde11747a27dc8550ff2281657a8ff) Signed-off-by: Michael Roth --- blockdev-nbd.c | 4 ++-- qemu-nbd.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index a700d52..18dc528 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -27,8 +27,8 @@ static void nbd_accept(void *opaque) socklen_t addr_len = sizeof(addr); int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); - if (fd >= 0) { - nbd_client_new(NULL, fd, nbd_client_put); + if (fd >= 0 && !nbd_client_new(NULL, fd, nbd_client_put)) { + close(fd); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index c26c98e..7a2cff9 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -299,8 +299,10 @@ static void nbd_accept(void *opaque) return; } - if (fd >= 0 && nbd_client_new(exp, fd, nbd_client_closed)) { + if (nbd_client_new(exp, fd, nbd_client_closed)) { nb_fds++; + } else { + close(fd); } } -- 1.9.1