From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 22 Feb 2012 11:37:13 +0000 (+0100)
Subject: qcow2: Reject too large header extensions
X-Git-Tag: v1.1-rc0~290^2~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=64ca6aee4f06a3af869e5e09f0afeb6721966875;p=qemu.git

qcow2: Reject too large header extensions

Image files that make qemu-img info read several gigabytes into the
unknown header extensions list are bad. Just fail opening the image
if an extension claims to be larger than the header extension area.

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

diff --git a/block/qcow2.c b/block/qcow2.c
index f68f0e107..eb5ea485d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -108,6 +108,11 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
 #ifdef DEBUG_EXT
         printf("ext.magic = 0x%x\n", ext.magic);
 #endif
+        if (ext.len > end_offset - offset) {
+            error_report("Header extension too large");
+            return -EINVAL;
+        }
+
         switch (ext.magic) {
         case QCOW2_EXT_MAGIC_END:
             return 0;