diff mbox

nbd: fix memory leak on socket_connect failed

Message ID 1491005709-29989-1-git-send-email-yaolujing@huawei.com
State New
Headers show

Commit Message

yaolujing April 1, 2017, 12:15 a.m. UTC 
From: y00357587 <yaolujing@huawei.com>

When TCP connection fails between nbd server and client,
the local var, sioc, memory leak.

This patch fixes the memory leak.

Signed-off-by: y00357587 <yaolujing@huawei.com>
---
 block/nbd.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Eric Blake April 1, 2017, 2:37 p.m. UTC | #1 
On 03/31/2017 07:15 PM, yaolujing wrote:
> From: y00357587 <yaolujing@huawei.com>
> 
> When TCP connection fails between nbd server and client,
> the local var, sioc, memory leak.
> 
> This patch fixes the memory leak.
> 
> Signed-off-by: y00357587 <yaolujing@huawei.com>
> ---
>  block/nbd.c | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block/nbd.c b/block/nbd.c
> index 35f24be..102285e 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -313,6 +313,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,
>                                      saddr,
>                                      &local_err);
>      if (local_err) {
> +        object_unref(OBJECT(sioc));
>          error_propagate(errp, local_err);
>          return NULL;
>      }
>
Paolo Bonzini April 3, 2017, 7:06 a.m. UTC | #2 
On 01/04/2017 02:15, yaolujing wrote:
> From: y00357587 <yaolujing@huawei.com>
> 
> When TCP connection fails between nbd server and client,
> the local var, sioc, memory leak.
> 
> This patch fixes the memory leak.
> 
> Signed-off-by: y00357587 <yaolujing@huawei.com>
> ---
>  block/nbd.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/block/nbd.c b/block/nbd.c
> index 35f24be..102285e 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -313,6 +313,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,
>                                      saddr,
>                                      &local_err);
>      if (local_err) {
> +        object_unref(OBJECT(sioc));
>          error_propagate(errp, local_err);
>          return NULL;
>      }
> 

Queued, thanks.

Paolo
diff mbox

Patch

diff --git a/block/nbd.c b/block/nbd.c
index 35f24be..102285e 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -313,6 +313,7 @@  static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,
                                     saddr,
                                     &local_err);
     if (local_err) {
+        object_unref(OBJECT(sioc));
         error_propagate(errp, local_err);
         return NULL;
     }