]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qcow: fix a reference leak
authorKONRAD Frederic <frederic.konrad@adacore.com>
Wed, 25 Jul 2018 18:07:29 +0000 (20:07 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 31 Jul 2018 16:46:31 +0000 (11:46 -0500)
Since 42a3e1ab367cdf38cce093de24eb406b99a4ef96 qemu asserts when using the
vvfat driver:

git clone git://qemu.org/qemu.git
cd qemu
./configure --target-list=ppc-softmmu --enable-debug
make -j8
mkdir foo
touch foo/hello
./ppc-softmmu/qemu-system-ppc -M prep --nographic --monitor null             \
                              -hda fat:rw:./foo

"Ctrl-C"

qemu-system-ppc: block.c:3368: bdrv_close_all: Assertion                     \
   `((&all_bdrv_states)->tqh_first == ((void *)0))' failed.

This is because we reference bs twice in qcow_co_create(..) one time in
bdrv_open_blockdev_ref(..) and in blk_insert_bs(..) but we unref it only once
in blk_unref which leads to the reference leak.

Note that I didn't tested much QCOW after this change as I don't use it much.

Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 41b6513436d2ebb64c7df8f009f630922a8e8990)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
block/qcow.c

index f92891676c985900c5b642dc7bfb26dda7e4d901..8dff0ad5d5e4f682ecbfe5b58fd2c37772963e20 100644 (file)
@@ -934,6 +934,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,
     ret = 0;
 exit:
     blk_unref(qcow_blk);
+    bdrv_unref(bs);
     qcrypto_block_free(crypto);
     return ret;
 }