[dpdk-stable] patch 'vhost: validate index in available entries API' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/24/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f2364da31bd9e061025b0e8c7ed7aee2c85e9db2

Thanks.

Kevin.

---
>From f2364da31bd9e061025b0e8c7ed7aee2c85e9db2 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Mon, 19 Oct 2020 19:34:10 +0200
Subject: [PATCH] vhost: validate index in available entries API

[ upstream commit 8c042f8191f8337da30958d0f622776861e417a5 ]

This patch validates the queue index parameter, in order
to ensure neither out-of-bound accesses nor NULL pointer
dereferencing happen.

Fixes: a67f286a6596 ("vhost: export queue free entries")

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
---
 lib/librte_vhost/vhost.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 7040bbfff8..2fd454441a 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -909,5 +909,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)
 		return 0;
 
+	if (queue_id >= VHOST_MAX_VRING)
+		return 0;
+
 	vq = dev->virtqueue[queue_id];
+	if (!vq)
+		return 0;
 
 	rte_spinlock_lock(&vq->access_lock);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:39.031140497 +0000
+++ 0058-vhost-validate-index-in-available-entries-API.patch	2020-11-18 16:33:37.982215096 +0000
@@ -1 +1 @@
-From 8c042f8191f8337da30958d0f622776861e417a5 Mon Sep 17 00:00:00 2001
+From f2364da31bd9e061025b0e8c7ed7aee2c85e9db2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8c042f8191f8337da30958d0f622776861e417a5 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 0c9ba3b3af..193dafc369 100644
+index 7040bbfff8..2fd454441a 100644
@@ -23 +24 @@
-@@ -1261,5 +1261,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)
+@@ -909,5 +909,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)