0a122b
From 94cdf32d7dfbfb12041eb58215e3074525a176b1 Mon Sep 17 00:00:00 2001
0a122b
From: Kevin Wolf <kwolf@redhat.com>
0a122b
Date: Tue, 25 Mar 2014 14:23:23 +0100
0a122b
Subject: [PATCH 16/49] vpc: Validate block size (CVE-2014-0142)
0a122b
0a122b
RH-Author: Kevin Wolf <kwolf@redhat.com>
0a122b
Message-id: <1395753835-7591-17-git-send-email-kwolf@redhat.com>
0a122b
Patchwork-id: n/a
0a122b
O-Subject: [virt-devel] [EMBARGOED RHEL-7.0 qemu-kvm PATCH 16/48] vpc: Validate block size (CVE-2014-0142)
0a122b
Bugzilla: 1079315
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=1079315
0a122b
Upstream status: Embargoed
0a122b
0a122b
This fixes some cases of division by zero crashes.
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
0a122b
Conflicts:
0a122b
tests/qemu-iotests/group
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
---
0a122b
 block/vpc.c                |    5 +++
0a122b
 tests/qemu-iotests/088     |   64 ++++++++++++++++++++++++++++++++++++++++++++
0a122b
 tests/qemu-iotests/088.out |   17 +++++++++++
0a122b
 tests/qemu-iotests/group   |    1 +
0a122b
 4 files changed, 87 insertions(+), 0 deletions(-)
0a122b
 create mode 100755 tests/qemu-iotests/088
0a122b
 create mode 100644 tests/qemu-iotests/088.out
0a122b
0a122b
diff --git a/block/vpc.c b/block/vpc.c
0a122b
index de5bc22..000d1c6 100644
0a122b
--- a/block/vpc.c
0a122b
+++ b/block/vpc.c
0a122b
@@ -235,6 +235,11 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
0a122b
         }
0a122b
 
0a122b
         s->block_size = be32_to_cpu(dyndisk_header->block_size);
0a122b
+        if (!is_power_of_2(s->block_size) || s->block_size < BDRV_SECTOR_SIZE) {
0a122b
+            error_setg(errp, "Invalid block size %" PRIu32, s->block_size);
0a122b
+            ret = -EINVAL;
0a122b
+            goto fail;
0a122b
+        }
0a122b
         s->bitmap_size = ((s->block_size / (8 * 512)) + 511) & ~511;
0a122b
 
0a122b
         s->max_table_entries = be32_to_cpu(dyndisk_header->max_table_entries);
0a122b
diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
0a122b
new file mode 100755
0a122b
index 0000000..c09adf8
0a122b
--- /dev/null
0a122b
+++ b/tests/qemu-iotests/088
0a122b
@@ -0,0 +1,64 @@
0a122b
+#!/bin/bash
0a122b
+#
0a122b
+# vpc (VHD) format input validation tests
0a122b
+#
0a122b
+# Copyright (C) 2014 Red Hat, Inc.
0a122b
+#
0a122b
+# This program is free software; you can redistribute it and/or modify
0a122b
+# it under the terms of the GNU General Public License as published by
0a122b
+# the Free Software Foundation; either version 2 of the License, or
0a122b
+# (at your option) any later version.
0a122b
+#
0a122b
+# This program is distributed in the hope that it will be useful,
0a122b
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
0a122b
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
0a122b
+# GNU General Public License for more details.
0a122b
+#
0a122b
+# You should have received a copy of the GNU General Public License
0a122b
+# along with this program.  If not, see <http: www.gnu.org="" licenses=""/>.
0a122b
+#
0a122b
+
0a122b
+# creator
0a122b
+owner=kwolf@redhat.com
0a122b
+
0a122b
+seq=`basename $0`
0a122b
+echo "QA output created by $seq"
0a122b
+
0a122b
+here=`pwd`
0a122b
+tmp=/tmp/$$
0a122b
+status=1	# failure is the default!
0a122b
+
0a122b
+_cleanup()
0a122b
+{
0a122b
+    rm -f $TEST_IMG.snap
0a122b
+    _cleanup_test_img
0a122b
+}
0a122b
+trap "_cleanup; exit \$status" 0 1 2 3 15
0a122b
+
0a122b
+# get standard environment, filters and checks
0a122b
+. ./common.rc
0a122b
+. ./common.filter
0a122b
+
0a122b
+_supported_fmt vpc
0a122b
+_supported_proto generic
0a122b
+_supported_os Linux
0a122b
+
0a122b
+offset_block_size=$((512 + 32))
0a122b
+
0a122b
+echo
0a122b
+echo "== Invalid block size =="
0a122b
+_make_test_img 64M
0a122b
+poke_file "$TEST_IMG" "$offset_block_size" "\x00\x00\x00\x00"
0a122b
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
0a122b
+{ $QEMU_IO -c "write 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
0a122b
+poke_file "$TEST_IMG" "$offset_block_size" "\x00\x00\x00\x80"
0a122b
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
0a122b
+{ $QEMU_IO -c "write 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
0a122b
+poke_file "$TEST_IMG" "$offset_block_size" "\x12\x34\x56\x78"
0a122b
+{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
0a122b
+{ $QEMU_IO -c "write 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
+status=0
0a122b
diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
0a122b
new file mode 100644
0a122b
index 0000000..d961609
0a122b
--- /dev/null
0a122b
+++ b/tests/qemu-iotests/088.out
0a122b
@@ -0,0 +1,17 @@
0a122b
+QA output created by 088
0a122b
+
0a122b
+== Invalid block size ==
0a122b
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
0a122b
+no file open, try 'help open'
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
0a122b
+no file open, try 'help open'
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
0a122b
+no file open, try 'help open'
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
0a122b
+no file open, try 'help open'
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
0a122b
+no file open, try 'help open'
0a122b
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
0a122b
+no file open, try 'help open'
0a122b
+*** done
0a122b
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
0a122b
index 30a0fd8..7d0d07e 100644
0a122b
--- a/tests/qemu-iotests/group
0a122b
+++ b/tests/qemu-iotests/group
0a122b
@@ -77,3 +77,4 @@
0a122b
 079 rw auto
0a122b
 082 rw auto quick
0a122b
 086 rw auto quick
0a122b
+088 rw auto
0a122b
-- 
0a122b
1.7.1
0a122b