qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 2/4] qcow2-refcount: Sanitize refcount table size
Date: Sun, 17 Nov 2013 15:18:42 +0100	[thread overview]
Message-ID: <1384697924-16918-3-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1384697924-16918-1-git-send-email-mreitz@redhat.com>

Make sure the refcount table size will not overflow when multiplied by
sizeof(uint64_t) and implicitly casted to int.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-refcount.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 1ff43d0..2912097 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -42,6 +42,10 @@ int qcow2_refcount_init(BlockDriverState *bs)
     BDRVQcowState *s = bs->opaque;
     int ret, refcount_table_size2, i;
 
+    if (s->refcount_table_size >= INT_MAX / sizeof(uint64_t)) {
+        goto fail;
+    }
+
     refcount_table_size2 = s->refcount_table_size * sizeof(uint64_t);
     s->refcount_table = g_malloc(refcount_table_size2);
     if (s->refcount_table_size > 0) {
-- 
1.8.4.2

  parent reply	other threads:[~2013-11-17 14:18 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 ` Max Reitz [this message]
2013-11-19 20:47   ` [Qemu-devel] [PATCH 2/4] qcow2-refcount: Sanitize refcount table size Eric Blake
2013-11-17 14:18 ` [Qemu-devel] [PATCH 3/4] qcow2: " Max Reitz
2013-11-19 20:48   ` 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-3-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).