diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-07-09 19:07:31 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-07-14 12:03:21 +0200 |
| commit | 3c2daac0b98952a858277878cb11294256b39e43 (patch) | |
| tree | a76b5e0962f0f1650b7007449b7290777de31597 | |
| parent | 42e38c1fd0199155d32f3464aedce282d3d7f6a1 (diff) | |
| download | qemu-3c2daac0b98952a858277878cb11294256b39e43.tar.gz | |
virtio-blk: Treat read/write beyond end as invalid
The block layer fails such reads and writes just fine. However, they
then get treated like valid operations that fail: the error action
gets executed. Unwanted; reporting the error to the guest is the only
sensible action.
Reject them before passing them to the block layer. This bypasses the
error action and I/O accounting.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/block/virtio-blk.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e6e62768e4..c241c5002b 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -291,12 +291,19 @@ static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb) static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, uint64_t sector, size_t size) { + uint64_t nb_sectors = size >> BDRV_SECTOR_BITS; + uint64_t total_sectors; + if (sector & dev->sector_mask) { return false; } if (size % dev->conf->logical_block_size) { return false; } + bdrv_get_geometry(dev->bs, &total_sectors); + if (sector > total_sectors || nb_sectors > total_sectors - sector) { + return false; + } return true; } |