* [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3
@ 2014-04-11 12:39 Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path Kevin Wolf
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Kevin Wolf @ 2014-04-11 12:39 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.maydell
The following changes since commit f516a5cc051db6e999e9e60dc968dcb5aeffe11f:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2014-04-10 23:07:56 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to 5450466394c95cea8b661fb197ed215a4ab5d700:
block-commit: speed is an optional parameter (2014-04-11 13:59:49 +0200)
----------------------------------------------------------------
Block patches for 2.0.0-rc3
----------------------------------------------------------------
Fam Zheng (1):
iscsi: Remember to set ret for iscsi_open in error case
Kevin Wolf (2):
bochs: Fix memory leak in bochs_open() error path
bochs: Fix catalog size check
Max Reitz (1):
block-commit: speed is an optional parameter
block/bochs.c | 20 +++++++++++++++-----
block/iscsi.c | 1 +
blockdev.c | 4 ++++
tests/qemu-iotests/078 | 6 +++++-
tests/qemu-iotests/078.out | 6 ++++--
5 files changed, 29 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
@ 2014-04-11 12:39 ` Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 2/4] bochs: Fix catalog size check Kevin Wolf
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2014-04-11 12:39 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.maydell
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
block/bochs.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 826ec12..50b84a9 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) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 2/4] bochs: Fix catalog size check
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path Kevin Wolf
@ 2014-04-11 12:39 ` Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 3/4] iscsi: Remember to set ret for iscsi_open in error case Kevin Wolf
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2014-04-11 12:39 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.maydell
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 <kwolf@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
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 50b84a9..eacf956 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 872e734..d4d6da7 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 ea95ffd..ca18d2e 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
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 3/4] iscsi: Remember to set ret for iscsi_open in error case
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 2/4] bochs: Fix catalog size check Kevin Wolf
@ 2014-04-11 12:39 ` Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter Kevin Wolf
2014-04-11 13:25 ` [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2014-04-11 12:39 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.maydell
From: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/iscsi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/block/iscsi.c b/block/iscsi.c
index 64a509f..f425573 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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
` (2 preceding siblings ...)
2014-04-11 12:39 ` [Qemu-devel] [PULL 3/4] iscsi: Remember to set ret for iscsi_open in error case Kevin Wolf
@ 2014-04-11 12:39 ` Kevin Wolf
2014-04-11 13:25 ` [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2014-04-11 12:39 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.maydell
From: Max Reitz <mreitz@redhat.com>
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 <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
blockdev.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index c3422a1..5dd01ea 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();
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
` (3 preceding siblings ...)
2014-04-11 12:39 ` [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter Kevin Wolf
@ 2014-04-11 13:25 ` Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2014-04-11 13:25 UTC (permalink / raw)
To: Kevin Wolf; +Cc: QEMU Developers
On 11 April 2014 13:39, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit f516a5cc051db6e999e9e60dc968dcb5aeffe11f:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2014-04-10 23:07:56 +0100)
>
> are available in the git repository at:
>
>
> git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to 5450466394c95cea8b661fb197ed215a4ab5d700:
>
> block-commit: speed is an optional parameter (2014-04-11 13:59:49 +0200)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-04-11 13:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 2/4] bochs: Fix catalog size check Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 3/4] iscsi: Remember to set ret for iscsi_open in error case Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter Kevin Wolf
2014-04-11 13:25 ` [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.