From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 3/4] qcow2: Sanitize refcount table size
Date: Sun, 17 Nov 2013 15:18:43 +0100 [thread overview]
Message-ID: <1384697924-16918-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1384697924-16918-1-git-send-email-mreitz@redhat.com>
Make sure there were no overflows when calculating the in-memory
refcount table size from the number of its clusters in-file.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/block/qcow2.c b/block/qcow2.c
index 3e612a8..9c29e1a 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -558,6 +558,14 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
s->refcount_table_size =
header.refcount_table_clusters << (s->cluster_bits - 3);
+ if ((s->refcount_table_size >> (s->cluster_bits - 3)) !=
+ header.refcount_table_clusters)
+ {
+ error_setg(errp, "Refcount table is too big");
+ ret = -EINVAL;
+ goto fail;
+ }
+
/* read the level 1 table */
s->l1_size = header.l1_size;
--
1.8.4.2
next prev parent reply other threads:[~2013-11-17 14:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-17 14:18 [Qemu-devel] [PATCH 0/4] qcow2: Fixes for invalid images Max Reitz
2013-11-17 14:18 ` [Qemu-devel] [PATCH 1/4] qcow2: Move reading nb_snapshots in qcow2_open Max Reitz
2013-11-19 20:46 ` Eric Blake
2013-11-17 14:18 ` [Qemu-devel] [PATCH 2/4] qcow2-refcount: Sanitize refcount table size Max Reitz
2013-11-19 20:47 ` Eric Blake
2013-11-17 14:18 ` Max Reitz [this message]
2013-11-19 20:48 ` [Qemu-devel] [PATCH 3/4] qcow2: " Eric Blake
2013-11-17 14:18 ` [Qemu-devel] [PATCH 4/4] qcow2: Check validity of backing file name length Max Reitz
2013-11-19 20:49 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384697924-16918-4-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).