[Devel] [PATCH hci-8.1 1/3] drivers/vhost/blk: convert virtio_blk_outhdr fields to CPU byte order

[Alexander Ivanov <alexander.ivanov@virtuozzo.com>]

hdr->type and hdr->sector are __virtio32 and __virtio64 but were used
without conversion. Since VIRTIO_F_VERSION_1 is offered, on a big-endian
host with a little-endian guest the request header was misinterpreted.

Convert both with vhost32_to_cpu()/vhost64_to_cpu() once, when the
request is set up.

https://virtuozzo.atlassian.net/browse/VSTOR-142755
Fixes: 1629db092dd7 ("drivers/vhost: vhost-blk accelerator for virtio-blk guests")
Feature: vhost-blk: in-kernel accelerator for virtio-blk guests
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
 drivers/vhost/blk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c
index b170439a1806..7234213924d5 100644
--- a/drivers/vhost/blk.c
+++ b/drivers/vhost/blk.c
@@ -454,16 +454,18 @@ static int vhost_blk_req_handle(struct vhost_virtqueue *vq,
 	struct iov_iter iter;
 	size_t in_len;
 	int ret, len;
+	u32 type;
 	u8 status;
 
 	req		= &blk_vq->req[head];
 	req->blk_vq	= blk_vq;
 	req->head	= head;
 	req->blk	= blk;
-	req->sector	= hdr->sector;
+	req->sector	= vhost64_to_cpu(vq, hdr->sector);
 	req->iov	= blk_vq->iov;
 	req->bio_err	= 0;
 	in_len		= iov_length(vq->iov + out, in);
+	type		= vhost32_to_cpu(vq, hdr->type);
 
 	if (in_len < sizeof(status) || in_len > INT_MAX)
 		return -EINVAL;
@@ -478,7 +480,7 @@ static int vhost_blk_req_handle(struct vhost_virtqueue *vq,
 	if (ret < 0 || req->iov_nr < 0)
 		return -EINVAL;
 
-	switch (hdr->type) {
+	switch (type) {
 	case VIRTIO_BLK_T_OUT:
 		req->bi_opf = REQ_OP_WRITE;
 		ret = vhost_blk_req_submit(req);
-- 
2.53.0

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel