|
 |
05bba0 |
From 77824d3e0c00074d30f345be594d4ca941585edd Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: Fam Zheng <famz@redhat.com>
|
|
|
05bba0 |
Date: Mon, 1 Jun 2015 08:23:51 +0200
|
|
|
05bba0 |
Subject: [PATCH 01/30] vmdk: Fix overflow if l1_size is 0x20000000
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <1433147031-14770-1-git-send-email-famz@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 65160
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH] vmdk: Fix overflow if l1_size is 0x20000000
|
|
|
05bba0 |
Bugzilla: 1217351
|
|
|
05bba0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
Richard Jones caught this bug with afl fuzzer.
|
|
|
05bba0 |
|
|
|
05bba0 |
In fact, that's the only possible value to overflow (extent->l1_size =
|
|
|
05bba0 |
0x20000000) l1_size:
|
|
|
05bba0 |
|
|
|
05bba0 |
l1_size = extent->l1_size * sizeof(long) => 0x80000000;
|
|
|
05bba0 |
|
|
|
05bba0 |
g_try_malloc returns NULL because l1_size is interpreted as negative
|
|
|
05bba0 |
during type casting from 'int' to 'gsize', which yields a enormous
|
|
|
05bba0 |
value. Hence, by coincidence, we get a "not too bad" behavior:
|
|
|
05bba0 |
|
|
|
05bba0 |
qemu-img: Could not open '/tmp/afl6.img': Could not open
|
|
|
05bba0 |
'/tmp/afl6.img': Cannot allocate memory
|
|
|
05bba0 |
|
|
|
05bba0 |
Values larger than 0x20000000 will be refused by the validation in
|
|
|
05bba0 |
vmdk_add_extent.
|
|
|
05bba0 |
|
|
|
05bba0 |
Values smaller than 0x20000000 will not overflow l1_size.
|
|
|
05bba0 |
|
|
|
05bba0 |
Cc: qemu-stable@nongnu.org
|
|
|
05bba0 |
Reported-by: Richard W.M. Jones <rjones@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
05bba0 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
Tested-by: Richard W.M. Jones <rjones@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
05bba0 |
(cherry picked from commit 13c4941cdd8685d28c7e3a09e393a5579b58db46)
|
|
|
05bba0 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
---
|
|
|
05bba0 |
block/vmdk.c | 3 ++-
|
|
|
05bba0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
05bba0 |
index 24e9458..6b015ab 100644
|
|
|
05bba0 |
--- a/block/vmdk.c
|
|
|
05bba0 |
+++ b/block/vmdk.c
|
|
|
05bba0 |
@@ -451,7 +451,8 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent,
|
|
|
05bba0 |
Error **errp)
|
|
|
05bba0 |
{
|
|
|
05bba0 |
int ret;
|
|
|
05bba0 |
- int l1_size, i;
|
|
|
05bba0 |
+ size_t l1_size;
|
|
|
05bba0 |
+ int i;
|
|
|
05bba0 |
|
|
|
05bba0 |
/* read the L1 table */
|
|
|
05bba0 |
l1_size = extent->l1_size * sizeof(uint32_t);
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|