On Thu, 06/05 14:15, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> ---
> hw/block/virtio-blk.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 8a568e5..f2b4dca 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -281,6 +281,18 @@ static void virtio_blk_handle_flush(VirtIOBlockReq *req,
> MultiReqBuffer *mrb)
> bdrv_aio_flush(req->dev->bs, virtio_blk_flush_complete, req);
> }
>
> +static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,
> + uint64_t sector, size_t size)
> +{
> + if (sector & dev->sector_mask) {
> + return false;
> + }
> + if (size % dev->conf->logical_block_size) {
> + return false;
> + }
> + return true;
> +}
> +
> static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb)
> {
> BlockRequest *blkreq;
> @@ -292,11 +304,7 @@ static void virtio_blk_handle_write(VirtIOBlockReq *req,
> MultiReqBuffer *mrb)
>
> trace_virtio_blk_handle_write(req, sector, req->qiov.size / 512);
>
> - if (sector & req->dev->sector_mask) {
> - virtio_blk_rw_complete(req, -EIO);
> - return;
> - }
> - if (req->qiov.size % req->dev->conf->logical_block_size) {
> + if (!virtio_blk_sect_range_ok(req->dev, sector, req->qiov.size)) {
> virtio_blk_rw_complete(req, -EIO);
> return;
> }
> @@ -326,11 +334,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req)
>
> trace_virtio_blk_handle_read(req, sector, req->qiov.size / 512);
>
> - if (sector & req->dev->sector_mask) {
> - virtio_blk_rw_complete(req, -EIO);
> - return;
> - }
> - if (req->qiov.size % req->dev->conf->logical_block_size) {
> + if (!virtio_blk_sect_range_ok(req->dev, sector, req->qiov.size)) {
> virtio_blk_rw_complete(req, -EIO);
> return;
> }
> --
> 1.9.3
>
>
Reviewed-by: Fam Zheng <f...@redhat.com>
