From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF84a-0002hX-RY for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF844-0005qB-7N for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:44:36 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:49947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF843-0005pt-UC for qemu-devel@nongnu.org; Wed, 06 Aug 2014 16:44:04 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Aug 2014 14:44:03 -0600 From: Michael Roth Date: Wed, 6 Aug 2014 15:39:42 -0500 Message-Id: <1407357598-21541-93-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1407357598-21541-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1407357598-21541-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 092/108] nbd: Shutdown socket before closing. 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 This forces finishing data sending to client before closing the socket like in exports listing or replying with NBD_REP_ERR_UNSUP cases. Signed-off-by: Hani Benhabiles Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 27e5eae4577316f7e86a56eb7363d4e78f79e3e5) Signed-off-by: Michael Roth --- blockdev-nbd.c | 1 + qemu-nbd.c | 1 + 2 files changed, 2 insertions(+) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 18dc528..b3a2474 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -28,6 +28,7 @@ static void nbd_accept(void *opaque) int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); if (fd >= 0 && !nbd_client_new(NULL, fd, nbd_client_put)) { + shutdown(fd, 2); close(fd); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index 4f53b9b..8a49798 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -372,6 +372,7 @@ static void nbd_accept(void *opaque) if (nbd_client_new(exp, fd, nbd_client_closed)) { nb_fds++; } else { + shutdown(fd, 2); close(fd); } } -- 1.9.1