Patchwork [STABLE,07/14] qcow2: Restore L1 entry on l2_allocate failure

login
register
mail settings
Submitter Kevin Wolf
Date July 14, 2010, 11:24 a.m.
Message ID <1279106653-24351-8-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/58873/
State New
Headers show

Comments

Kevin Wolf - July 14, 2010, 11:24 a.m.
If writing the L1 table to disk failed, we need to restore its old content in
memory to avoid inconsistencies.

Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 68dba0bf455e60061bb3c9c40ef0d82916372664)
---
 block/qcow2-cluster.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Patch

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index b7a5b35..8c67e3c 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -266,6 +266,7 @@  static uint64_t *l2_allocate(BlockDriverState *bs, int l1_index)
     return l2_table;
 
 fail:
+    s->l1_table[l1_index] = old_l2_offset;
     qcow2_l2_cache_reset(bs);
     return NULL;
 }