[Qemu-devel] [PATCH 0/2] blkverify: Fix BDS leak in .bdrv_open error path

[Qemu-devel] [PATCH 0/2] blkverify: Fix BDS leak in .bdrv_open error path

[Kevin Wolf]

Kevin Wolf (2):
  block: Allow bdrv_unref_child(bs, NULL)
  blkverify: Fix BDS leak in .bdrv_open error path

 block.c           | 7 ++++++-
 block/blkverify.c | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH 1/2] block: Allow bdrv_unref_child(bs, NULL)

[Kevin Wolf]

bdrv_unref() can be called with a NULL argument and doesn't do anything
then. Make bdrv_unref_child() consistent with it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index f38146e..6490040 100644
--- a/block.c
+++ b/block.c
@@ -1104,12 +1104,17 @@ static void bdrv_detach_child(BdrvChild *child)
 
 void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child)
 {
-    BlockDriverState *child_bs = child->bs;
+    BlockDriverState *child_bs;
+
+    if (child == NULL) {
+        return;
+    }
 
     if (child->bs->inherits_from == parent) {
         child->bs->inherits_from = NULL;
     }
 
+    child_bs = child->bs;
     bdrv_detach_child(child);
     bdrv_unref(child_bs);
 }
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 1/2] block: Allow bdrv_unref_child(bs, NULL)

[Jeff Cody]

On Tue, Oct 13, 2015 at 02:17:39PM +0200, Kevin Wolf wrote:
> bdrv_unref() can be called with a NULL argument and doesn't do anything
> then. Make bdrv_unref_child() consistent with it.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/block.c b/block.c
> index f38146e..6490040 100644
> --- a/block.c
> +++ b/block.c
> @@ -1104,12 +1104,17 @@ static void bdrv_detach_child(BdrvChild *child)
>  
>  void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child)
>  {
> -    BlockDriverState *child_bs = child->bs;
> +    BlockDriverState *child_bs;
> +
> +    if (child == NULL) {
> +        return;
> +    }
>  
>      if (child->bs->inherits_from == parent) {
>          child->bs->inherits_from = NULL;
>      }
>  
> +    child_bs = child->bs;
>      bdrv_detach_child(child);
>      bdrv_unref(child_bs);
>  }
> -- 
> 1.8.3.1
>

Reviewed-by: Jeff Cody <jcody@redhat.com>

[Qemu-devel] [PATCH 2/2] blkverify: Fix BDS leak in .bdrv_open error path

[Kevin Wolf]

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/blkverify.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/blkverify.c b/block/blkverify.c
index f8655ad..c5f8e8d 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -143,6 +143,9 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
 
     ret = 0;
 fail:
+    if (ret < 0) {
+        bdrv_unref_child(bs, bs->file);
+    }
     qemu_opts_del(opts);
     return ret;
 }
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 2/2] blkverify: Fix BDS leak in .bdrv_open error path

[Jeff Cody]

On Tue, Oct 13, 2015 at 02:17:40PM +0200, Kevin Wolf wrote:
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/blkverify.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/block/blkverify.c b/block/blkverify.c
> index f8655ad..c5f8e8d 100644
> --- a/block/blkverify.c
> +++ b/block/blkverify.c
> @@ -143,6 +143,9 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
>  
>      ret = 0;
>  fail:
> +    if (ret < 0) {
> +        bdrv_unref_child(bs, bs->file);
> +    }
>      qemu_opts_del(opts);
>      return ret;
>  }
> -- 
> 1.8.3.1
>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Re: [Qemu-devel] [Qemu-block] [PATCH 0/2] blkverify: Fix BDS leak in .bdrv_open error path

[Stefan Hajnoczi]

On Tue, Oct 13, 2015 at 02:17:38PM +0200, Kevin Wolf wrote:
> Kevin Wolf (2):
>   block: Allow bdrv_unref_child(bs, NULL)
>   blkverify: Fix BDS leak in .bdrv_open error path
> 
>  block.c           | 7 ++++++-
>  block/blkverify.c | 3 +++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> -- 
> 1.8.3.1
> 
> 

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