summaryrefslogtreecommitdiff
path: root/block/qcow2.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2014-03-26 13:05:50 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-04-01 15:22:34 +0200
commit2b5d5953eec0cc541857c3df812bdf8421596ab2 (patch)
tree46005cfd30454c30b3e4853a8146e1ac260bee3c /block/qcow2.c
parentdb8a31d11d6a60f48d6817530640d75aa72a9a2f (diff)
downloadqemu-2b5d5953eec0cc541857c3df812bdf8421596ab2.tar.gz
qcow2: Check new refcount table size on growth
If the size becomes larger than what qcow2_open() would accept, fail the growing operation. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/qcow2.c')
-rw-r--r--block/qcow2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index d4d991cbb3..b64564d171 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -609,9 +609,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
s->refcount_table_size =
header.refcount_table_clusters << (s->cluster_bits - 3);
- if (header.refcount_table_clusters > (0x800000 >> s->cluster_bits)) {
- /* 8 MB refcount table is enough for 2 PB images at 64k cluster size
- * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
+ if (header.refcount_table_clusters > qcow2_max_refcount_clusters(s)) {
error_setg(errp, "Reference count table too large");
ret = -EINVAL;
goto fail;