aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorLaurent Vivier <lvivier@redhat.com>2024-11-27 11:25:21 +0100
committerStefano Brivio <sbrivio@redhat.com>2024-11-27 16:49:21 +0100
commit6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05 (patch)
treed255fdb833caa0e8b3b3530ab73077807333f914
parent7e131e920c04054b9d005dac718ac54e5169fa71 (diff)
downloadpasst-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar.gz
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar.bz2
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar.lz
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar.xz
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.tar.zst
passt-6fae899cbbb3ec5bc9a0d5c7dde16131b2f85f05.zip
virtio: check if avail ring is configured
If the connection to the vhost-user front end is closed during transfers virtio rings are deconfigured and not available anymore, but we can try to access them to process queued data. This can trigger a SIGSEG as we try to access unavailable memory. To fix that check vq->vring.avail is sane before accessing the vring Signed-off-by: Laurent Vivier <lvivier@redhat.com> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--virtio.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/virtio.c b/virtio.c
index 6a97435..0598ff4 100644
--- a/virtio.c
+++ b/virtio.c
@@ -284,6 +284,9 @@ static int virtqueue_read_next_desc(const struct vring_desc *desc,
*/
bool vu_queue_empty(struct vu_virtq *vq)
{
+ if (!vq->vring.avail)
+ return true;
+
if (vq->shadow_avail_idx != vq->last_avail_idx)
return false;
@@ -327,6 +330,9 @@ static bool vring_can_notify(const struct vu_dev *dev, struct vu_virtq *vq)
*/
void vu_queue_notify(const struct vu_dev *dev, struct vu_virtq *vq)
{
+ if (!vq->vring.avail)
+ return;
+
if (!vring_can_notify(dev, vq)) {
debug("vhost-user: virtqueue can skip notify...");
return;
@@ -502,6 +508,9 @@ int vu_queue_pop(struct vu_dev *dev, struct vu_virtq *vq, struct vu_virtq_elemen
unsigned int head;
int ret;
+ if (!vq->vring.avail)
+ return -1;
+
if (vu_queue_empty(vq))
return -1;
@@ -591,6 +600,9 @@ void vu_queue_fill_by_index(struct vu_virtq *vq, unsigned int index,
{
struct vring_used_elem uelem;
+ if (!vq->vring.avail)
+ return;
+
idx = (idx + vq->used_idx) % vq->vring.num;
uelem.id = htole32(index);
@@ -633,6 +645,9 @@ void vu_queue_flush(struct vu_virtq *vq, unsigned int count)
{
uint16_t old, new;
+ if (!vq->vring.avail)
+ return;
+
/* Make sure buffer is written before we update index. */
smp_wmb();