[Qemu-devel] [PATCH] qcow2: Assert that refcount block offsets fit in the refcount table

* [Qemu-devel] [PATCH] qcow2: Assert that refcount block offsets fit in the refcount table
@ 2018-11-13 16:45 Alberto Garcia
  2018-11-13 17:06 ` [Qemu-devel] [for 3.1? PATCH] " Eric Blake
  0 siblings, 1 reply; 5+ messages in thread
From: Alberto Garcia @ 2018-11-13 16:45 UTC (permalink / raw)
  To: qemu-devel; +Cc: Alberto Garcia, qemu-block, Kevin Wolf, Max Reitz, Eric Blake

Refcount table entries have a field to store the offset of the
refcount block. The rest of the bits of the entry are currently
reserved.

The offset is always taken from the entry using REFT_OFFSET_MASK to
ensure that we only use the bits that belong to that field.

While that mask is used every time we read from the refcount table, it
is never used when we write to it. Due to the other constraints of the
qcow2 format QEMU can never produce refcount block offsets that don't
fit in that field so any such offset when allocating a refcount block
would indicate a bug in QEMU.
---
 block/qcow2-refcount.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 46082aeac1..31a2e1f845 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -367,6 +367,9 @@ static int alloc_refcount_block(BlockDriverState *bs,
         return new_block;
     }
 
+    /* The offset must fit in the offset field of the refcount table entry */
+    assert((new_block & REFT_OFFSET_MASK) == new_block);
+
     /* If we're allocating the block at offset 0 then something is wrong */
     if (new_block == 0) {
         qcow2_signal_corruption(bs, true, -1, -1, "Preventing invalid "
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread