From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dufAW-00024b-Qe for qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dufAS-00011k-Sx for qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:36:00 -0400 From: Manos Pitsidianakis Date: Wed, 20 Sep 2017 14:43:09 +0300 Message-Id: <20170920114310.13080-2-el13635@mail.ntua.gr> In-Reply-To: <20170920114310.13080-1-el13635@mail.ntua.gr> References: <20170920114310.13080-1-el13635@mail.ntua.gr> Subject: [Qemu-devel] [PATCH 1/2] block/block-backend.c: add blk_check_byte_request call to blk_pread/blk_pwrite List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: qemu-block , Kevin Wolf , Max Reitz , John Snow blk_check_byte_request() is called from the blk_co_pwritev/blk_co_preadv to check if the request offset and request bytes parameters are valid for the given Blockbackend. Let's do that in blk_pread/blk_pwrite too. Signed-off-by: Manos Pitsidianakis --- block/block-backend.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 45d9101be3..110a52d5b1 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1288,22 +1288,23 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count) { - int ret = blk_prw(blk, offset, buf, count, blk_read_entry, 0); + int ret = blk_check_byte_request(blk, offset, count); if (ret < 0) { return ret; } - return count; + ret = blk_prw(blk, offset, buf, count, blk_read_entry, 0); + return ret < 0 ? ret : count; } int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int count, BdrvRequestFlags flags) { - int ret = blk_prw(blk, offset, (void *) buf, count, blk_write_entry, - flags); + int ret = blk_check_byte_request(blk, offset, count); if (ret < 0) { return ret; } - return count; + ret = blk_prw(blk, offset, (void *) buf, count, blk_write_entry, flags); + return ret < 0 ? ret : count; } int64_t blk_getlength(BlockBackend *blk) -- 2.11.0