41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From aef547884b8a64c0754b4b7906ae9d7c912b8043 Mon Sep 17 00:00:00 2001
|
|
From: Chenbo Xia <chenbo.xia@intel.com>
|
|
Date: Mon, 14 Feb 2022 16:32:37 +0800
|
|
Subject: vhost: fix queue number check when setting inflight FD
|
|
|
|
[ upstream commit 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 ]
|
|
|
|
In function vhost_user_set_inflight_fd, queue number in inflight
|
|
message is used to access virtqueue. However, queue number could
|
|
be larger than VHOST_MAX_VRING and cause write OOB as this number
|
|
will be used to write inflight info in virtqueue structure. This
|
|
patch checks the queue number to avoid the issue and also make
|
|
sure virtqueues are allocated before setting inflight information.
|
|
|
|
Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information")
|
|
Cc: stable@dpdk.org
|
|
|
|
Reported-by: Wenxiang Qian <leonwxqian@gmail.com>
|
|
Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
|
|
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
|
|
---
|
|
lib/librte_vhost/vhost_user.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
|
|
index 1ee6050ac0..79be132c43 100644
|
|
--- a/lib/librte_vhost/vhost_user.c
|
|
+++ b/lib/librte_vhost/vhost_user.c
|
|
@@ -2624,6 +2624,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev,
|
|
case VHOST_USER_SET_VRING_ADDR:
|
|
vring_idx = msg->payload.addr.index;
|
|
break;
|
|
+ case VHOST_USER_SET_INFLIGHT_FD:
|
|
+ vring_idx = msg->payload.inflight.num_queues - 1;
|
|
+ break;
|
|
default:
|
|
return 0;
|
|
}
|
|
--
|
|
cgit v1.2.1
|