[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] vhost: fix error check in vhost_verify_ring_mapp
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 5/7] vhost: fix error check in vhost_verify_ring_mappings() |
Date: |
Fri, 1 Dec 2017 19:08:51 +0200 |
From: Greg Kurz <address@hidden>
Since commit f1f9e6c5 "vhost: adapt vhost_verify_ring_mappings() to
virtio 1 ring layout", we check the mapping of each part (descriptor
table, available ring and used ring) of each virtqueue separately.
The checking of a part is done by the vhost_verify_ring_part_mapping()
function: it returns either 0 on success or a negative errno if the
part cannot be mapped at the same place.
Unfortunately, the vhost_verify_ring_mappings() function checks its
return value the other way round. It means that we either:
- only verify the descriptor table of the first virtqueue, and if it
is valid we ignore all the other mappings
- or ignore all broken mappings until we reach a valid one
ie, we only raise an error if all mappings are broken, and we consider
all mappings are valid otherwise (false success), which is obviously
wrong.
This patch ensures that vhost_verify_ring_mappings() only returns
success if ALL mappings are okay.
Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 5404194..e4290ce 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -493,21 +493,21 @@ static int vhost_verify_ring_mappings(struct vhost_dev
*dev,
j = 0;
r = vhost_verify_ring_part_mapping(dev, vq->desc, vq->desc_phys,
vq->desc_size, start_addr, size);
- if (!r) {
+ if (r) {
break;
}
j++;
r = vhost_verify_ring_part_mapping(dev, vq->avail, vq->avail_phys,
vq->avail_size, start_addr, size);
- if (!r) {
+ if (r) {
break;
}
j++;
r = vhost_verify_ring_part_mapping(dev, vq->used, vq->used_phys,
vq->used_size, start_addr, size);
- if (!r) {
+ if (r) {
break;
}
}
--
MST
- [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 1/7] i386/msi: Correct mask of destination ID in MSI address, Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 2/7] virtio: Add queue interface to restore avail index from vring used index, Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 3/7] vhost: restore avail index from vring used index on disconnection, Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 4/7] dump-guest-memory.py: fix No symbol "vmcoreinfo_find", Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 5/7] vhost: fix error check in vhost_verify_ring_mappings(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 6/7] virtio: check VirtQueue Vring object is set, Michael S. Tsirkin, 2017/12/01
- [Qemu-devel] [PULL 7/7] pc: fix crash on attempted cpu unplug, Michael S. Tsirkin, 2017/12/01
- Re: [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Peter Maydell, 2017/12/01
- Re: [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Michael S. Tsirkin, 2017/12/02
- Re: [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Peter Maydell, 2017/12/04
- Re: [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Peter Maydell, 2017/12/04
- Re: [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3, Michael S. Tsirkin, 2017/12/04