From: John Snow Date: Wed, 22 Jun 2016 19:51:03 +0000 (-0400) Subject: mirror: limit niov to IOV_MAX elements, again X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e4808881cbbe8ee9b587a49dd5fabd88375affd6;p=qemu.git mirror: limit niov to IOV_MAX elements, again During the refactor of mirror_iteration in e5b43573, we regressed the fix introduced in cae98cb8. This patch re-adds IOV_MAX checking to cases where we aren't checking alignment (and size) already. Signed-off-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Fam Zheng Message-id: 1466625064-11280-3-git-send-email-jsnow@redhat.com Signed-off-by: Jeff Cody --- diff --git a/block/mirror.c b/block/mirror.c index 42ebc3b9e9..5bac906d82 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -231,11 +231,14 @@ static int mirror_do_read(MirrorBlockJob *s, int64_t sector_num, int sectors_per_chunk, nb_chunks; int ret; MirrorOp *op; + int max_sectors; sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS; + max_sectors = sectors_per_chunk * s->max_iov; /* We can only handle as much as buf_size at a time. */ nb_sectors = MIN(s->buf_size >> BDRV_SECTOR_BITS, nb_sectors); + nb_sectors = MIN(max_sectors, nb_sectors); assert(nb_sectors); ret = nb_sectors;