[Qemu-devel] [PATCH 1/2] nbd: Close socket on negotiation failure.

[Qemu-devel] [PATCH 1/2] nbd: Close socket on negotiation failure.

[Hani Benhabiles]

Otherwise, the nbd client may hang waiting for the server response.

Signed-off-by: Hani Benhabiles <hani@linux.com>
---

Quick method to trigger such behaviour:

(qemu) nbd_server_start localhost:10809
(qemu) nbd_server_add sd0
$ nbd-client localhost 10809 -name AAAA /dev/nbd0
Negotiation: ..

(Client will hang indefinitely.)

 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 922cf56..b60b66d 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 eed79fa..f70e4b0 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);
     }
 }
 
-- 
1.8.3.2

[Qemu-devel] [PATCH 2/2] nbd: Miscellaneous typo fixes.

[Hani Benhabiles]

Signed-off-by: Hani Benhabiles <hani@linux.com>
---
 nbd.c         | 2 +-
 qemu-nbd.c    | 2 +-
 qemu-nbd.texi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nbd.c b/nbd.c
index e5084b6..e0d032c 100644
--- a/nbd.c
+++ b/nbd.c
@@ -306,7 +306,7 @@ static int nbd_send_negotiate(NBDClient *client)
         [ 8 ..  15]   magic        (NBD_CLIENT_MAGIC)
         [16 ..  23]   size
         [24 ..  25]   server flags (0)
-        [24 ..  27]   export flags
+        [26 ..  27]   export flags
         [28 .. 151]   reserved     (0)
 
        Negotiation header with options, part 1:
diff --git a/qemu-nbd.c b/qemu-nbd.c
index f70e4b0..cd6bd50 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -294,7 +294,7 @@ static void *nbd_client_thread(void *arg)
     fd = open(device, O_RDWR);
     if (fd < 0) {
         /* Linux-only, we can use %m in printf.  */
-        fprintf(stderr, "Failed to open %s: %m", device);
+        fprintf(stderr, "Failed to open %s: %m\n", device);
         goto out_socket;
     }
 
diff --git a/qemu-nbd.texi b/qemu-nbd.texi
index 0a7e013..46fd483 100644
--- a/qemu-nbd.texi
+++ b/qemu-nbd.texi
@@ -15,7 +15,7 @@ Export QEMU disk image using NBD protocol.
 @item @var{filename}
  is a disk image filename
 @item -p, --port=@var{port}
-  port to listen on (default @samp{1024})
+  port to listen on (default @samp{10809})
 @item -o, --offset=@var{offset}
   offset into the image
 @item -b, --bind=@var{iface}
-- 
1.8.3.2

Re: [Qemu-devel] [PATCH 2/2] nbd: Miscellaneous typo fixes.

[Paolo Bonzini]

Il 13/05/2014 01:35, Hani Benhabiles ha scritto:
> Signed-off-by: Hani Benhabiles <hani@linux.com>
> ---
>  nbd.c         | 2 +-
>  qemu-nbd.c    | 2 +-
>  qemu-nbd.texi | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/nbd.c b/nbd.c
> index e5084b6..e0d032c 100644
> --- a/nbd.c
> +++ b/nbd.c
> @@ -306,7 +306,7 @@ static int nbd_send_negotiate(NBDClient *client)
>          [ 8 ..  15]   magic        (NBD_CLIENT_MAGIC)
>          [16 ..  23]   size
>          [24 ..  25]   server flags (0)
> -        [24 ..  27]   export flags
> +        [26 ..  27]   export flags
>          [28 .. 151]   reserved     (0)
>
>         Negotiation header with options, part 1:
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index f70e4b0..cd6bd50 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -294,7 +294,7 @@ static void *nbd_client_thread(void *arg)
>      fd = open(device, O_RDWR);
>      if (fd < 0) {
>          /* Linux-only, we can use %m in printf.  */
> -        fprintf(stderr, "Failed to open %s: %m", device);
> +        fprintf(stderr, "Failed to open %s: %m\n", device);
>          goto out_socket;
>      }
>
> diff --git a/qemu-nbd.texi b/qemu-nbd.texi
> index 0a7e013..46fd483 100644
> --- a/qemu-nbd.texi
> +++ b/qemu-nbd.texi
> @@ -15,7 +15,7 @@ Export QEMU disk image using NBD protocol.
>  @item @var{filename}
>   is a disk image filename
>  @item -p, --port=@var{port}
> -  port to listen on (default @samp{1024})
> +  port to listen on (default @samp{10809})
>  @item -o, --offset=@var{offset}
>    offset into the image
>  @item -b, --bind=@var{iface}
>


Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Re: [Qemu-devel] [PATCH 2/2] nbd: Miscellaneous typo fixes.

[Stefan Hajnoczi]

On Tue, May 13, 2014 at 12:35:16AM +0100, Hani Benhabiles wrote:
> Signed-off-by: Hani Benhabiles <hani@linux.com>
> ---
>  nbd.c         | 2 +-
>  qemu-nbd.c    | 2 +-
>  qemu-nbd.texi | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] nbd: Miscellaneous typo fixes.

[Michael Tokarev]

Applied to -trivial, thanks!

/mjt

Re: [Qemu-devel] [PATCH 1/2] nbd: Close socket on negotiation failure.

[Paolo Bonzini]

Il 13/05/2014 01:35, Hani Benhabiles ha scritto:
> Otherwise, the nbd client may hang waiting for the server response.
>
> Signed-off-by: Hani Benhabiles <hani@linux.com>
> ---
>
> Quick method to trigger such behaviour:
>
> (qemu) nbd_server_start localhost:10809
> (qemu) nbd_server_add sd0
> $ nbd-client localhost 10809 -name AAAA /dev/nbd0
> Negotiation: ..
>
> (Client will hang indefinitely.)
>
>  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 922cf56..b60b66d 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 eed79fa..f70e4b0 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);
>      }
>  }
>
>

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Michael, can you queue this yourself?

Paolo

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/2] nbd: Close socket on negotiation failure.

[Michael Tokarev]

13.05.2014 03:35, Hani Benhabiles wrote:
> Otherwise, the nbd client may hang waiting for the server response.

Applied to -trivial, thanks!

/mjt