From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yspzg-0002og-JF for qemu-devel@nongnu.org; Thu, 14 May 2015 06:03:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yspzb-0002rk-Va for qemu-devel@nongnu.org; Thu, 14 May 2015 06:03:56 -0400 Received: from [59.151.112.132] (port=42044 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yspzb-0002mD-Jt for qemu-devel@nongnu.org; Thu, 14 May 2015 06:03:51 -0400 Message-ID: <555473F4.1070709@cn.fujitsu.com> Date: Thu, 14 May 2015 18:07:48 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] mirror: correct buf_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Kevin Wolf , Jeff Cody , Fam Zheng If buf_size % granularity is not 0, mirror_free_init() will do dangerous things. Signed-off-by: Wen Congyang --- block/mirror.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index 58f391a..bb6bc27 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -686,6 +686,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, s->granularity = granularity; s->buf_size = MAX(buf_size, granularity); + if (s->buf_size % granularity != 0) { + s->buf_size = ROUND_UP(s->buf_size, granularity); + } + s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); if (!s->dirty_bitmap) { return; -- 2.1.0