From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt5dq-00017Q-HU for qemu-devel@nongnu.org; Thu, 14 May 2015 22:46:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yt5dn-0006oL-86 for qemu-devel@nongnu.org; Thu, 14 May 2015 22:46:26 -0400 Received: from [59.151.112.132] (port=40224 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt5dm-0006nV-Sf for qemu-devel@nongnu.org; Thu, 14 May 2015 22:46:23 -0400 Message-ID: <55555909.1020002@cn.fujitsu.com> Date: Fri, 15 May 2015 10:25:13 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v4] mirror: correct buf_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Paolo Bonzini , Fam Zheng Cc: Kevin Wolf , Jeff Cody If bus_size is less than 0, the command fails. If buf_size % granularity is not 0, mirror_free_init() will do dangerous things. Signed-off-by: Wen Congyang Reviewed-by: Fam Zheng --- block/mirror.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 58f391a..603fdf9 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, return; } + if (buf_size < 0) { + error_setg(errp, "Invalid parameter 'buf-size'"); + return; + } s = block_job_create(driver, bs, speed, cb, opaque, errp); if (!s) { @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, s->is_none_mode = is_none_mode; s->base = base; s->granularity = granularity; - s->buf_size = MAX(buf_size, granularity); + s->buf_size = ROUND_UP(buf_size, granularity); s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); if (!s->dirty_bitmap) { -- 2.1.0