diff options
| author | Hani Benhabiles <kroosec@gmail.com> | 2014-05-13 00:35:15 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-07-15 19:28:01 -0500 |
| commit | 25351f6a9ad55990d5140a928fd6ea29e48943af (patch) | |
| tree | f39c2e85c73e55cef2bfb176412694c1ca02a0a9 /blockdev-nbd.c | |
| parent | cf392d2c7c0f10adc5d9d4f740e034b646605fff (diff) | |
| download | qemu-25351f6a9ad55990d5140a928fd6ea29e48943af.tar.gz | |
nbd: Close socket on negotiation failure.
Otherwise, the nbd client may hang waiting for the server response.
Signed-off-by: Hani Benhabiles <hani@linux.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 36af599417dde11747a27dc8550ff2281657a8ff)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'blockdev-nbd.c')
| -rw-r--r-- | blockdev-nbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/blockdev-nbd.c b/blockdev-nbd.c index a700d52d71..18dc528761 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); } } |