vhost: fix missing lock protection in power monitor API

[ upstream commit b4c4e5675c85a9b471c252305811d15f6a6d2aa6 ] The power monitor get API is missing both access lock protection and access status check. Fixes: 34fd437 ("vhost: add power monitor API") Signed-off-by: Maxime Coquelin <[email protected]> Acked-by: David Marchand <[email protected]> Signed-off-by: Maxime Coquelin <[email protected]>
kevintraynor · Nov 23, 2023 · 45cef81 · 45cef81
1 parent 9b63dd4
commit 45cef81
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
@@ -1949,6 +1949,7 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id,
 {
 	struct virtio_net *dev = get_device(vid);
 	struct vhost_virtqueue *vq;
+	int ret = 0;
 
 	if (dev == NULL)
 		return -1;
@@ -1959,6 +1960,13 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id,
 	if (vq == NULL)
 		return -1;
 
+	rte_spinlock_lock(&vq->access_lock);
+
+	if (unlikely(!vq->access_ok)) {
+		ret = -1;
+		goto out_unlock;
+	}
+
 	if (vq_is_packed(dev)) {
 		struct vring_packed_desc *desc;
 		desc = vq->desc_packed;
@@ -1978,7 +1986,10 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id,
 		pmc->match = 0;
 	}
 
-	return 0;
+out_unlock:
+	rte_spinlock_unlock(&vq->access_lock);
+
+	return ret;
 }
 
 RTE_LOG_REGISTER_SUFFIX(vhost_config_log_level, config, INFO);