vhost-user-test: fix leaks

[Qemu-devel] [PATCH] vhost-user-test: fix leaks

Posted by Marc-André Lureau 6 years, 11 months ago

Spotted by ASAN.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/vhost-user-test.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 4cd0a97f13..9364227ba4 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -588,6 +588,7 @@ static void test_server_free(TestServer *server)
         g_test_message("unable to rmdir: path (%s): %s",
                        server->tmpfs, strerror(errno));
     }
+    g_free(server->tmpfs);
 
     qemu_chr_fe_deinit(&server->chr, true);
 
@@ -605,6 +606,8 @@ static void test_server_free(TestServer *server)
 
     g_main_loop_unref(server->loop);
     g_main_context_unref(server->context);
+    g_cond_clear(&server->data_cond);
+    g_mutex_clear(&server->data_mutex);
     g_free(server);
 }
 
-- 
2.21.0.4.g36eb1cb9cf

Re: [Qemu-devel] [PATCH] vhost-user-test: fix leaks

Posted by Thomas Huth 6 years, 11 months ago

On 05/03/2019 23.51, Marc-André Lureau wrote:
> Spotted by ASAN.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/vhost-user-test.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index 4cd0a97f13..9364227ba4 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -588,6 +588,7 @@ static void test_server_free(TestServer *server)
>          g_test_message("unable to rmdir: path (%s): %s",
>                         server->tmpfs, strerror(errno));
>      }
> +    g_free(server->tmpfs);
>  
>      qemu_chr_fe_deinit(&server->chr, true);
>  
> @@ -605,6 +606,8 @@ static void test_server_free(TestServer *server)
>  
>      g_main_loop_unref(server->loop);
>      g_main_context_unref(server->context);
> +    g_cond_clear(&server->data_cond);
> +    g_mutex_clear(&server->data_mutex);
>      g_free(server);
>  }

Reviewed-by: Thomas Huth <thuth@redhat.com>

... and queued to my qtest-next branch (unless Michael wants to take it
through hist vhost tree instead).

Re: [Qemu-devel] [PATCH] vhost-user-test: fix leaks

Posted by Michael S. Tsirkin 6 years, 11 months ago

On Wed, Mar 06, 2019 at 07:35:28AM +0100, Thomas Huth wrote:
> On 05/03/2019 23.51, Marc-André Lureau wrote:
> > Spotted by ASAN.
> > 
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >  tests/vhost-user-test.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> > index 4cd0a97f13..9364227ba4 100644
> > --- a/tests/vhost-user-test.c
> > +++ b/tests/vhost-user-test.c
> > @@ -588,6 +588,7 @@ static void test_server_free(TestServer *server)
> >          g_test_message("unable to rmdir: path (%s): %s",
> >                         server->tmpfs, strerror(errno));
> >      }
> > +    g_free(server->tmpfs);
> >  
> >      qemu_chr_fe_deinit(&server->chr, true);
> >  
> > @@ -605,6 +606,8 @@ static void test_server_free(TestServer *server)
> >  
> >      g_main_loop_unref(server->loop);
> >      g_main_context_unref(server->context);
> > +    g_cond_clear(&server->data_cond);
> > +    g_mutex_clear(&server->data_mutex);
> >      g_free(server);
> >  }
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> ... and queued to my qtest-next branch (unless Michael wants to take it
> through hist vhost tree instead).

No it's fine.

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Re: [Qemu-devel] [PATCH] vhost-user-test: fix leaks

Posted by Stefano Garzarella 6 years, 11 months ago

On Tue, Mar 05, 2019 at 11:51:35PM +0100, Marc-André Lureau wrote:
> Spotted by ASAN.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/vhost-user-test.c | 3 +++
>  1 file changed, 3 insertions(+)

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Thanks,
Stefano

Re: [Qemu-devel] [PATCH] vhost-user-test: fix leaks

Posted by Philippe Mathieu-Daudé 6 years, 11 months ago

On 3/5/19 11:51 PM, Marc-André Lureau wrote:
> Spotted by ASAN.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/vhost-user-test.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index 4cd0a97f13..9364227ba4 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -588,6 +588,7 @@ static void test_server_free(TestServer *server)
>          g_test_message("unable to rmdir: path (%s): %s",
>                         server->tmpfs, strerror(errno));
>      }
> +    g_free(server->tmpfs);

Fixes: ae31fb54914 and 4d3f50eb489
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  
>      qemu_chr_fe_deinit(&server->chr, true);
>  
> @@ -605,6 +606,8 @@ static void test_server_free(TestServer *server)
>  
>      g_main_loop_unref(server->loop);
>      g_main_context_unref(server->context);
> +    g_cond_clear(&server->data_cond);
> +    g_mutex_clear(&server->data_mutex);
>      g_free(server);
>  }
>  
>