[Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents()

[Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents()

[Stefan Hajnoczi]

See patches for the specific leaks.

Stefan Hajnoczi (2):
  vmdk: fix vmdk_parse_extents() extent_file leaks
  vmdk: fix buf leak in vmdk_parse_extents()

 block/vmdk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
1.9.3

[Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks

[Stefan Hajnoczi]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vmdk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/vmdk.c b/block/vmdk.c
index 07cb62c..9bf28f3 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -834,6 +834,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             ret = vmdk_add_extent(bs, extent_file, true, sectors,
                             0, 0, 0, 0, 0, &extent, errp);
             if (ret < 0) {
+                bdrv_unref(extent_file);
                 return ret;
             }
             extent->flat_start_offset = flat_offset << 9;
@@ -853,6 +854,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             extent = &s->extents[s->num_extents - 1];
         } else {
             error_setg(errp, "Unsupported extent type '%s'", type);
+            bdrv_unref(extent_file);
             return -ENOTSUP;
         }
         extent->type = g_strdup(type);
-- 
1.9.3

[Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents()

[Stefan Hajnoczi]

vmdk_open_sparse() does not take ownership of buf so the caller always
needs to free it.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vmdk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 9bf28f3..a1cb911 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -846,8 +846,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             } else {
                 ret = vmdk_open_sparse(bs, extent_file, bs->open_flags, buf, errp);
             }
+            g_free(buf);
             if (ret) {
-                g_free(buf);
                 bdrv_unref(extent_file);
                 return ret;
             }
-- 
1.9.3

Re: [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks

[Max Reitz]

On 04.09.2014 22:04, Stefan Hajnoczi wrote:
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/vmdk.c | 2 ++
>   1 file changed, 2 insertions(+)

Reviewed-by: Max Reitz <mreitz@redhat.com>

Re: [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents()

[Max Reitz]

On 04.09.2014 22:04, Stefan Hajnoczi wrote:
> vmdk_open_sparse() does not take ownership of buf so the caller always
> needs to free it.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/vmdk.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Max Reitz <mreitz@redhat.com>

Re: [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks

[Fam Zheng]

On Thu, 09/04 21:04, Stefan Hajnoczi wrote:
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/vmdk.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 07cb62c..9bf28f3 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -834,6 +834,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
>              ret = vmdk_add_extent(bs, extent_file, true, sectors,
>                              0, 0, 0, 0, 0, &extent, errp);
>              if (ret < 0) {
> +                bdrv_unref(extent_file);
>                  return ret;
>              }
>              extent->flat_start_offset = flat_offset << 9;
> @@ -853,6 +854,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
>              extent = &s->extents[s->num_extents - 1];
>          } else {
>              error_setg(errp, "Unsupported extent type '%s'", type);
> +            bdrv_unref(extent_file);
>              return -ENOTSUP;
>          }
>          extent->type = g_strdup(type);
> -- 
> 1.9.3
> 
Reviewed-by: Fam Zheng <famz@redhat.com>

Re: [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents()

[Fam Zheng]

On Thu, 09/04 21:04, Stefan Hajnoczi wrote:
> vmdk_open_sparse() does not take ownership of buf so the caller always
> needs to free it.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/vmdk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 9bf28f3..a1cb911 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -846,8 +846,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
>              } else {
>                  ret = vmdk_open_sparse(bs, extent_file, bs->open_flags, buf, errp);
>              }
> +            g_free(buf);
>              if (ret) {
> -                g_free(buf);
>                  bdrv_unref(extent_file);
>                  return ret;
>              }
> -- 
> 1.9.3
> 
Reviewed-by: Fam Zheng <famz@redhat.com>

Re: [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents()

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

On Thu, Sep 04, 2014 at 09:04:41PM +0100, Stefan Hajnoczi wrote:
> See patches for the specific leaks.
> 
> Stefan Hajnoczi (2):
>   vmdk: fix vmdk_parse_extents() extent_file leaks
>   vmdk: fix buf leak in vmdk_parse_extents()
> 
>  block/vmdk.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> -- 
> 1.9.3
> 
> 

Applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]