commit bd60436936ecebf2c683eef9ea561f2b949700f3
author Kevin Wolf <kwolf@redhat.com> Mon May 19 17:56:01 2014 +0200
committer Stefan Hajnoczi <stefanha@redhat.com> Wed May 28 14:28:46 2014 +0200
tree a211604b6ad5f4b6c33cd170e4be0fca91265660
parent 4ba6fabfb447661ee44ee593b2c454c7ffd1183f

qcow2: Fix memory leak in COW error path

This triggers if bs->drv becomes NULL in a concurrent request. This is
currently only the case when corruption prevention kicks in (i.e. at
most once per image, and after that it produces I/O errors).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block/qcow2-cluster.c

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 76d2bcf..4208dc0 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -379,7 +379,8 @@
     BLKDBG_EVENT(bs->file, BLKDBG_COW_READ);
 
     if (!bs->drv) {
-        return -ENOMEDIUM;
+        ret = -ENOMEDIUM;
+        goto out;
     }
 
     /* Call .bdrv_co_readv() directly instead of using the public block-layer