From 18b6f15777b951d359a04d4470e81b99fd44af20 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 6 Nov 2020 15:47:44 +0100 Subject: [PATCH] vhost: fix virtqueue initialization [ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ] This patches fixes virtqueue initialization issue causing segfault or file descriptor being closed unexpectedly. The wrong index was passed to init_vring_queue() by alloc_vring_queue() when a hole in the virtqueue array was met. Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation") Reported-by: Yu Jiang Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand Tested-by: Yu Jiang --- lib/librte_vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 9f3eadeba6..3dd278f8f8 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -575,7 +575,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) } dev->virtqueue[i] = vq; - init_vring_queue(dev, vring_idx); + init_vring_queue(dev, i); rte_spinlock_init(&vq->access_lock); vq->avail_wrap_counter = 1; vq->used_wrap_counter = 1;