From 28ec11bc882387e51c7450558af5a49b8be95a36 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 9 Apr 2014 11:19:04 +0200 Subject: [PATCH 1/4] bochs: Fix memory leak in bochs_open() error path Signed-off-by: Kevin Wolf Reviewed-by: Laszlo Ersek --- block/bochs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index 826ec1203c..50b84a91f3 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -150,11 +150,13 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, s->extent_size = le32_to_cpu(bochs.extent); if (s->extent_size == 0) { error_setg(errp, "Extent size may not be zero"); - return -EINVAL; + ret = -EINVAL; + goto fail; } else if (s->extent_size > 0x800000) { error_setg(errp, "Extent size %" PRIu32 " is too large", s->extent_size); - return -EINVAL; + ret = -EINVAL; + goto fail; } if (s->catalog_size < bs->total_sectors / s->extent_size) { From 715c3f60efa9801a777a71cd06eaf8efa7eaa2a8 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 9 Apr 2014 12:10:34 +0200 Subject: [PATCH 2/4] bochs: Fix catalog size check The old check was off by a factor of 512 and didn't consider cases where we don't get an exact division. This could lead to an out-of-bounds array access in seek_to_sector(). Signed-off-by: Kevin Wolf Reviewed-by: Laszlo Ersek --- block/bochs.c | 14 +++++++++++--- tests/qemu-iotests/078 | 6 +++++- tests/qemu-iotests/078.out | 6 ++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index 50b84a91f3..eacf956e7d 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -148,8 +148,14 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, s->extent_blocks = 1 + (le32_to_cpu(bochs.extent) - 1) / 512; s->extent_size = le32_to_cpu(bochs.extent); - if (s->extent_size == 0) { - error_setg(errp, "Extent size may not be zero"); + if (s->extent_size < BDRV_SECTOR_SIZE) { + /* bximage actually never creates extents smaller than 4k */ + error_setg(errp, "Extent size must be at least 512"); + ret = -EINVAL; + goto fail; + } else if (!is_power_of_2(s->extent_size)) { + error_setg(errp, "Extent size %" PRIu32 " is not a power of two", + s->extent_size); ret = -EINVAL; goto fail; } else if (s->extent_size > 0x800000) { @@ -159,7 +165,9 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - if (s->catalog_size < bs->total_sectors / s->extent_size) { + if (s->catalog_size < DIV_ROUND_UP(bs->total_sectors, + s->extent_size / BDRV_SECTOR_SIZE)) + { error_setg(errp, "Catalog size is too small for this disk size"); ret = -EINVAL; goto fail; diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index 872e734cab..d4d6da7b09 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -69,10 +69,14 @@ _use_sample_img empty.bochs.bz2 poke_file "$TEST_IMG" "$disk_size_offset" "\x00\xc0\x0f\x00\x00\x00\x00\x7f" { $QEMU_IO -c "read 2T 4k" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir +_use_sample_img empty.bochs.bz2 +poke_file "$TEST_IMG" "$catalog_size_offset" "\x10\x00\x00\x00" +{ $QEMU_IO -c "read 0xfbe00 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir + echo echo "== Negative extent size ==" _use_sample_img empty.bochs.bz2 -poke_file "$TEST_IMG" "$extent_size_offset" "\xff\xff\xff\xff" +poke_file "$TEST_IMG" "$extent_size_offset" "\x00\x00\x00\x80" { $QEMU_IO -c "read 768k 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir echo diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out index ea95ffdbb8..ca18d2ea38 100644 --- a/tests/qemu-iotests/078.out +++ b/tests/qemu-iotests/078.out @@ -15,12 +15,14 @@ no file open, try 'help open' == Too small catalog bitmap for image size == qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size no file open, try 'help open' +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size +no file open, try 'help open' == Negative extent size == -qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 4294967295 is too large +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large no file open, try 'help open' == Zero extent size == -qemu-io: can't open device TEST_DIR/empty.bochs: Extent size may not be zero +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512 no file open, try 'help open' *** done From cd82b6fb4daf87f17742f7971ba6cb90d23e6703 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 10 Apr 2014 09:33:55 +0800 Subject: [PATCH 3/4] iscsi: Remember to set ret for iscsi_open in error case Signed-off-by: Fam Zheng Signed-off-by: Kevin Wolf --- block/iscsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/iscsi.c b/block/iscsi.c index 64a509f8f4..f425573df8 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1233,6 +1233,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, iscsi_readcapacity_sync(iscsilun, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); + ret = -EINVAL; goto out; } bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun); From 5450466394c95cea8b661fb197ed215a4ab5d700 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Thu, 10 Apr 2014 19:36:25 +0200 Subject: [PATCH 4/4] block-commit: speed is an optional parameter As speed is an optional parameter for the QMP block-commit command, it should be set to 0 if not given (as it is undefined if has_speed is false), that is, the speed should not be limited. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- blockdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blockdev.c b/blockdev.c index c3422a1d41..5dd01ea147 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1876,6 +1876,10 @@ void qmp_block_commit(const char *device, */ BlockdevOnError on_error = BLOCKDEV_ON_ERROR_REPORT; + if (!has_speed) { + speed = 0; + } + /* drain all i/o before commits */ bdrv_drain_all();