diff options
| author | Hani Benhabiles <kroosec@gmail.com> | 2014-05-13 00:35:15 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-05-24 00:07:29 +0400 |
| commit | 36af599417dde11747a27dc8550ff2281657a8ff (patch) | |
| tree | 7bfe8799f5474489db6f25b2f6e77d3a72c0824c | |
| parent | aef553fdcabbea8760cd4647ab14859095300023 (diff) | |
| download | focaccia-qemu-36af599417dde11747a27dc8550ff2281657a8ff.tar.gz focaccia-qemu-36af599417dde11747a27dc8550ff2281657a8ff.zip | |
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>
| -rw-r--r-- | blockdev-nbd.c | 4 | ||||
| -rw-r--r-- | qemu-nbd.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 922cf5657b..b60b66d66c 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 eed79fa15e..f70e4b0dfc 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -369,8 +369,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); } } |