diff options
| author | Hani Benhabiles | 2014-05-13 01:35:15 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2014-05-23 22:07:29 +0200 |
| commit | 36af599417dde11747a27dc8550ff2281657a8ff (patch) | |
| tree | 7bfe8799f5474489db6f25b2f6e77d3a72c0824c /blockdev-nbd.c | |
| parent | iohandler.c: Properly initialize sigaction struct (diff) | |
| download | qemu-36af599417dde11747a27dc8550ff2281657a8ff.tar.gz qemu-36af599417dde11747a27dc8550ff2281657a8ff.tar.xz 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>
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 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); } } |