From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPwkQ-0008P7-MG for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPwkK-0001zR-Sr for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:30 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:44046 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPwkK-0001zJ-JX for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:24 -0400 From: Peter Lieven Date: Fri, 5 Sep 2014 18:51:26 +0200 Message-Id: <1409935888-18552-3-git-send-email-pl@kamp.de> In-Reply-To: <1409935888-18552-1-git-send-email-pl@kamp.de> References: <1409935888-18552-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 2/4] block: immediately cancel oversized read/write requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com Signed-off-by: Peter Lieven --- block.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/block.c b/block.c index 2c4a5de..fa4c34b 100644 --- a/block.c +++ b/block.c @@ -3215,6 +3215,13 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, return -EINVAL; } + if (bs->bl.max_transfer_length && nb_sectors > bs->bl.max_transfer_length) { + error_report("read of %d sectors at sector %ld exceeds device max" + " transfer length of %d sectors.", nb_sectors, sector_num, + bs->bl.max_transfer_length); + return -EINVAL; + } + return bdrv_co_do_preadv(bs, sector_num << BDRV_SECTOR_BITS, nb_sectors << BDRV_SECTOR_BITS, qiov, flags); } @@ -3507,6 +3514,13 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, return -EINVAL; } + if (bs->bl.max_transfer_length && nb_sectors > bs->bl.max_transfer_length) { + error_report("write of %d sectors at sector %ld exceeds device max" + " transfer length of %d sectors.", nb_sectors, sector_num, + bs->bl.max_transfer_length); + return -EINVAL; + } + return bdrv_co_do_pwritev(bs, sector_num << BDRV_SECTOR_BITS, nb_sectors << BDRV_SECTOR_BITS, qiov, flags); } -- 1.7.9.5