[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/30] qcow2: Don't put invalid L2 table into cache
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 25/30] qcow2: Don't put invalid L2 table into cache |
Date: |
Fri, 27 Sep 2013 17:39:25 +0200 |
From: Max Reitz <address@hidden>
In l2_allocate, the fail path is executed if qcow2_cache_flush fails.
However, the L2 table has not yet been fetched from the L2 table cache.
The qcow2_cache_put in the fail path therefore basically gives an
undefined argument as the L2 table address (in this case).
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index ffa8941..153ea50 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -188,7 +188,7 @@ static int l2_allocate(BlockDriverState *bs, int l1_index,
uint64_t **table)
{
BDRVQcowState *s = bs->opaque;
uint64_t old_l2_offset;
- uint64_t *l2_table;
+ uint64_t *l2_table = NULL;
int64_t l2_offset;
int ret;
@@ -265,7 +265,9 @@ static int l2_allocate(BlockDriverState *bs, int l1_index,
uint64_t **table)
fail:
trace_qcow2_l2_allocate_done(bs, l1_index, ret);
- qcow2_cache_put(bs, s->l2_table_cache, (void**) table);
+ if (l2_table != NULL) {
+ qcow2_cache_put(bs, s->l2_table_cache, (void**) table);
+ }
s->l1_table[l1_index] = old_l2_offset;
return ret;
}
--
1.8.1.4
- [Qemu-devel] [PULL 16/30] block: qcow2 - used QEMU_PACKED for on-disk structures, (continued)
- [Qemu-devel] [PULL 16/30] block: qcow2 - used QEMU_PACKED for on-disk structures, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 19/30] block: use DIV_ROUND_UP in bdrv_co_do_readv, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 21/30] qemu-iotests: Add basic ability to use binary sample images, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 22/30] qemu-iotests: Quote $TEST_IMG* and $TEST_DIR usage, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 26/30] qcow2: Always use error path in l2_allocate, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 28/30] qcow2: count_contiguous_clusters and compression, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 27/30] qcow2: Free only newly allocated clusters on error, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 29/30] qcow2: COMPRESSED on count_contiguous_clusters, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 30/30] qcow2: Remove useless count_contiguous_clusters() parameter, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 24/30] qemu-iotests: Preallocated zero clusters in 061, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 25/30] qcow2: Don't put invalid L2 table into cache,
Kevin Wolf <=