|
 |
0a122b |
From fdbe21cc29a983e05b6df725a75b1a1b15d7795e Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
Date: Tue, 25 Mar 2014 14:23:32 +0100
|
|
|
0a122b |
Subject: [PATCH 25/49] qcow2: Validate active L1 table offset and size (CVE-2014-0144)
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
Message-id: <1395753835-7591-26-git-send-email-kwolf@redhat.com>
|
|
|
0a122b |
Patchwork-id: n/a
|
|
|
0a122b |
O-Subject: [virt-devel] [EMBARGOED RHEL-7.0 qemu-kvm PATCH 25/48] qcow2: Validate active L1 table offset and size (CVE-2014-0144)
|
|
|
0a122b |
Bugzilla: 1079455
|
|
|
0a122b |
RH-Acked-by: Jeff Cody <jcody@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1079455
|
|
|
0a122b |
Upstream status: Embargoed
|
|
|
0a122b |
|
|
|
0a122b |
This avoids an unbounded allocation.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block/qcow2.c | 16 ++++++++++++++++
|
|
|
0a122b |
tests/qemu-iotests/080 | 18 ++++++++++++++++++
|
|
|
0a122b |
tests/qemu-iotests/080.out | 11 +++++++++++
|
|
|
0a122b |
3 files changed, 45 insertions(+), 0 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
0a122b |
index 8c74dea..8be82f0 100644
|
|
|
0a122b |
--- a/block/qcow2.c
|
|
|
0a122b |
+++ b/block/qcow2.c
|
|
|
0a122b |
@@ -641,6 +641,13 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
0a122b |
s->nb_snapshots = header.nb_snapshots;
|
|
|
0a122b |
|
|
|
0a122b |
/* read the level 1 table */
|
|
|
0a122b |
+ if (header.l1_size > 0x2000000) {
|
|
|
0a122b |
+ /* 32 MB L1 table is enough for 2 PB images at 64k cluster size
|
|
|
0a122b |
+ * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */
|
|
|
0a122b |
+ error_setg(errp, "Active L1 table too large");
|
|
|
0a122b |
+ ret = -EFBIG;
|
|
|
0a122b |
+ goto fail;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
s->l1_size = header.l1_size;
|
|
|
0a122b |
|
|
|
0a122b |
l1_vm_state_index = size_to_l1(s, header.size);
|
|
|
0a122b |
@@ -658,7 +665,16 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
0a122b |
ret = -EINVAL;
|
|
|
0a122b |
goto fail;
|
|
|
0a122b |
}
|
|
|
0a122b |
+
|
|
|
0a122b |
+ ret = validate_table_offset(bs, header.l1_table_offset,
|
|
|
0a122b |
+ header.l1_size, sizeof(uint64_t));
|
|
|
0a122b |
+ if (ret < 0) {
|
|
|
0a122b |
+ error_setg(errp, "Invalid L1 table offset");
|
|
|
0a122b |
+ goto fail;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
s->l1_table_offset = header.l1_table_offset;
|
|
|
0a122b |
+
|
|
|
0a122b |
+
|
|
|
0a122b |
if (s->l1_size > 0) {
|
|
|
0a122b |
s->l1_table = g_malloc0(
|
|
|
0a122b |
align_offset(s->l1_size * sizeof(uint64_t), 512));
|
|
|
0a122b |
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
|
|
|
0a122b |
index 8a8b460..7255b6c 100755
|
|
|
0a122b |
--- a/tests/qemu-iotests/080
|
|
|
0a122b |
+++ b/tests/qemu-iotests/080
|
|
|
0a122b |
@@ -45,6 +45,8 @@ _supported_os Linux
|
|
|
0a122b |
header_size=104
|
|
|
0a122b |
|
|
|
0a122b |
offset_backing_file_offset=8
|
|
|
0a122b |
+offset_l1_size=36
|
|
|
0a122b |
+offset_l1_table_offset=40
|
|
|
0a122b |
offset_refcount_table_offset=48
|
|
|
0a122b |
offset_refcount_table_clusters=56
|
|
|
0a122b |
offset_nb_snapshots=60
|
|
|
0a122b |
@@ -117,6 +119,22 @@ poke_file "$TEST_IMG" "$offset_nb_snapshots" "\x00\x01\x00\x00"
|
|
|
0a122b |
{ $QEMU_IMG snapshot -c test $TEST_IMG; } 2>&1 | _filter_testdir
|
|
|
0a122b |
{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
0a122b |
|
|
|
0a122b |
+echo
|
|
|
0a122b |
+echo "== Invalid L1 table =="
|
|
|
0a122b |
+_make_test_img 64M
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_size" "\xff\xff\xff\xff"
|
|
|
0a122b |
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_size" "\x7f\xff\xff\xff"
|
|
|
0a122b |
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
0a122b |
+
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_table_offset" "\x7f\xff\xff\xff\xff\xff\x00\x00"
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_size" "\x00\x00\xff\xff"
|
|
|
0a122b |
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
0a122b |
+
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_table_offset" "\x12\x34\x56\x78\x90\xab\xcd\xef"
|
|
|
0a122b |
+poke_file "$TEST_IMG" "$offset_l1_size" "\x00\x00\x00\x01"
|
|
|
0a122b |
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
0a122b |
+
|
|
|
0a122b |
# success, all done
|
|
|
0a122b |
echo "*** done"
|
|
|
0a122b |
rm -f $seq.full
|
|
|
0a122b |
diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
|
|
|
0a122b |
index b06f47f..4ec2545 100644
|
|
|
0a122b |
--- a/tests/qemu-iotests/080.out
|
|
|
0a122b |
+++ b/tests/qemu-iotests/080.out
|
|
|
0a122b |
@@ -47,4 +47,15 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
0a122b |
qemu-img: Could not create snapshot 'test': -27 (File too large)
|
|
|
0a122b |
read 512/512 bytes at offset 0
|
|
|
0a122b |
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
0a122b |
+
|
|
|
0a122b |
+== Invalid L1 table ==
|
|
|
0a122b |
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
0a122b |
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
|
|
|
0a122b |
+no file open, try 'help open'
|
|
|
0a122b |
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
|
|
|
0a122b |
+no file open, try 'help open'
|
|
|
0a122b |
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid L1 table offset
|
|
|
0a122b |
+no file open, try 'help open'
|
|
|
0a122b |
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid L1 table offset
|
|
|
0a122b |
+no file open, try 'help open'
|
|
|
0a122b |
*** done
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|