From: Jeff Cody <jcody@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org
Subject: [Qemu-devel] [PATCH 0/2] block: vpc - prevent overflow
Date: Wed, 24 Jun 2015 15:54:26 -0400 [thread overview]
Message-ID: <cover.1435175476.git.jcody@redhat.com> (raw)
This series fixes a bug found by Richard Jones.
When we allocate the pagetable based on max_table_entries, we multiply
the max table entry value by 4 to accomodate a table of 32-bit integers.
However, max_table_entries is a uint32_t, and the VPC driver accepts
ranges for that entry over 0x40000000. So during this allocation:
s->pagetable = qemu_try_blockalign(bs->file, s->max_table_entries * 4);
The size arg overflows, allocating significantly less memory than
expected.
Since qemu_try_blockalign() size argument is size_t, cast the
multiplication correctly to prevent overflow.
The value of "max_table_entries * 4" is used elsewhere in the code as
well, so store the correct value for use in all those cases.
Jeff Cody (2):
block: vpc - prevent overflow if max_table_entries >= 0x40000000
block: qemu-iotests - add check for multiplication overflow in vpc
block/vpc.c | 10 +++--
tests/qemu-iotests/135 | 54 ++++++++++++++++++++++++++
tests/qemu-iotests/135.out | 5 +++
tests/qemu-iotests/group | 1 +
tests/qemu-iotests/sample_images/afl5.img.bz2 | Bin 0 -> 175 bytes
5 files changed, 66 insertions(+), 4 deletions(-)
create mode 100755 tests/qemu-iotests/135
create mode 100644 tests/qemu-iotests/135.out
create mode 100644 tests/qemu-iotests/sample_images/afl5.img.bz2
--
1.9.3
next reply other threads:[~2015-06-24 19:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 19:54 Jeff Cody [this message]
2015-06-24 19:54 ` [Qemu-devel] [PATCH 1/2] block: vpc - prevent overflow if max_table_entries >= 0x40000000 Jeff Cody
2015-06-25 14:28 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-06-25 15:05 ` Jeff Cody
2015-06-26 9:57 ` Stefan Hajnoczi
2015-07-08 11:55 ` Kevin Wolf
2015-07-09 10:12 ` Stefan Hajnoczi
2015-06-24 19:54 ` [Qemu-devel] [PATCH 2/2] block: qemu-iotests - add check for multiplication overflow in vpc Jeff Cody
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=cover.1435175476.git.jcody@redhat.com \
--to=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).