diff mbox

[1/2] vmdk: fix vmdk_parse_extents() extent_file leaks

Message ID 1409861083-9634-2-git-send-email-stefanha@redhat.com
State New
Headers show

Commit Message

Stefan Hajnoczi Sept. 4, 2014, 8:04 p.m. UTC 
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vmdk.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Max Reitz Sept. 4, 2014, 8:11 p.m. UTC | #1 
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>
Fam Zheng Sept. 5, 2014, 4:52 a.m. UTC | #2 
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>
diff mbox

Patch

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);