[v6,1/6] block/vdi: When writing new bmap entry fails, don't leak the buffer

Commit Message

Paolo Bonzini March 25, 2021, 11:29 a.m. UTC

From: David Edmondson <[e-mail]>

If a new bitmap entry is allocated, requiring the entire block to be
written, avoiding leaking the buffer allocated for the block should
the write fail.

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: David Edmondson <[e-mail]>
Message-Id: <[e-mail]>
Acked-by: Max Reitz <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 block/vdi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Stefan Hajnoczi March 30, 2021, 3:28 p.m. UTC | #1

On Thu, Mar 25, 2021 at 12:29:36PM +0100, Paolo Bonzini wrote:
> From: David Edmondson <[e-mail]>
> 
> If a new bitmap entry is allocated, requiring the entire block to be
> written, avoiding leaking the buffer allocated for the block should
> the write fail.
> 
> Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
> Signed-off-by: David Edmondson <[e-mail]>
> Message-Id: <[e-mail]>
> Acked-by: Max Reitz <[e-mail]>
> Signed-off-by: Paolo Bonzini <[e-mail]>
> ---
>  block/vdi.c | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Stefan Hajnoczi <[e-mail]>

Patch

diff --git a/block/vdi.c b/block/vdi.c
index 5627e7d764..2a6dc26124 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -690,6 +690,7 @@  nonallocating_write:
 
     logout("finished data write\n");
     if (ret < 0) {
+        g_free(block);
         return ret;
     }