patch 'vhost: fix queue number check when setting inflight FD' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/17/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9bac6ad8620073470cceba5848150102b0b9ed19

Thanks.

Luca Boccassi

---
>From 9bac6ad8620073470cceba5848150102b0b9ed19 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia at intel.com>
Date: Mon, 14 Feb 2022 16:32:37 +0800
Subject: [PATCH] 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")

Reported-by: Wenxiang Qian <leonwxqian at gmail.com>
Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at 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 11d58113a7..c829ce95fb 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2692,6 +2692,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;
 	}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-15 12:13:39.104683513 +0000
+++ 0001-vhost-fix-queue-number-check-when-setting-inflight-F.patch	2022-03-15 12:13:39.024180007 +0000
@@ -1 +1 @@
-From 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 Mon Sep 17 00:00:00 2001
+From 9bac6ad8620073470cceba5848150102b0b9ed19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
- lib/vhost/vhost_user.c | 3 +++
+ lib/librte_vhost/vhost_user.c | 3 +++
@@ -23,5 +24,5 @@
-diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
-index 589b950458..1ec4357bee 100644
---- a/lib/vhost/vhost_user.c
-+++ b/lib/vhost/vhost_user.c
-@@ -2883,6 +2883,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev,
+diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
+index 11d58113a7..c829ce95fb 100644
+--- a/lib/librte_vhost/vhost_user.c
++++ b/lib/librte_vhost/vhost_user.c
+@@ -2692,6 +2692,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev,
@@ -29 +30 @@
- 		vring_idx = ctx->msg.payload.addr.index;
+ 		vring_idx = msg->payload.addr.index;
@@ -32 +33 @@
-+		vring_idx = ctx->msg.payload.inflight.num_queues - 1;
++		vring_idx = msg->payload.inflight.num_queues - 1;