[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 9/9] virtio-blk: Fix and clean up the in_sg and o
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 9/9] virtio-blk: Fix and clean up the in_sg and out_sg check |
Date: |
Wed, 11 Jun 2014 12:11:50 +0800 |
out_sg is checked by iov_to_buf below, so it can be dropped.
Add assert and iov_discard_back around in_sg, as the in_sg is handled in
dataplane code.
Signed-off-by: Fam Zheng <address@hidden>
---
hw/block/virtio-blk.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 09b6b60..b9d0d0a 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -345,7 +345,9 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
{
uint32_t type;
+ struct iovec *in_iov = req->elem->in_sg;
struct iovec *iov = req->elem->out_sg;
+ unsigned in_num = req->elem->in_num;
unsigned out_num = req->elem->out_num;
if (req->elem->out_num < 1 || req->elem->in_num < 1) {
@@ -353,19 +355,24 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req,
exit(1);
}
- if (req->elem->out_sg[0].iov_len < sizeof(req->out) ||
- req->elem->in_sg[req->elem->in_num - 1].iov_len < sizeof(*req->in)) {
- error_report("virtio-blk header not in correct element");
- exit(1);
- }
-
if (unlikely(iov_to_buf(iov, out_num, 0, &req->out,
sizeof(req->out)) != sizeof(req->out))) {
error_report("virtio-blk request outhdr too short");
exit(1);
}
+
iov_discard_front(&iov, &out_num, sizeof(req->out));
- req->in = (void *)req->elem->in_sg[req->elem->in_num - 1].iov_base;
+
+ if (in_num < 1 ||
+ in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) {
+ error_report("virtio-blk request inhdr too short");
+ exit(1);
+ }
+
+ req->in = (void *)in_iov[in_num - 1].iov_base
+ + in_iov[in_num - 1].iov_len
+ - sizeof(struct virtio_blk_inhdr);
+ iov_discard_back(in_iov, &in_num, sizeof(struct virtio_blk_inhdr));
type = ldl_p(&req->out.type);
--
2.0.0
- [Qemu-devel] [PATCH v4 0/9] virtio-blk: Converge VirtIOBlockRequest into VirtIOBlockReq, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 1/9] virtio-blk: Move VirtIOBlockReq to header, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 2/9] virtio-blk: Convert VirtIOBlockReq.elem to pointer, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 4/9] virtio-blk: Drop VirtIOBlockRequest.read, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 3/9] virtio-blk: Drop bounce buffer from dataplane code, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 5/9] virtio-blk: Replace VirtIOBlockRequest with VirtIOBlockReq, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 6/9] virtio-blk: Use VirtIOBlockReq.in to drop VirtIOBlockReq.inhdr, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 7/9] virtio-blk: Convert VirtIOBlockReq.out to structrue, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 8/9] virtio-blk: Fill in VirtIOBlockReq.out in dataplane code, Fam Zheng, 2014/06/11
- [Qemu-devel] [PATCH v4 9/9] virtio-blk: Fix and clean up the in_sg and out_sg check,
Fam Zheng <=
- Re: [Qemu-devel] [PATCH v4 0/9] virtio-blk: Converge VirtIOBlockRequest into VirtIOBlockReq, Stefan Hajnoczi, 2014/06/27