[dpdk-stable] patch 'vhost: validate index in guest notification API' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/11/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/bluca/dpdk-stable

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

Thanks.

Luca Boccassi

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

[ upstream commit 366374054b656e049188216e2fa44831749c2a21 ]

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

Fixes: 9eed6bfd2efb ("vhost: allow to enable or disable features")

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 0f6c1ef8de..2d23de598e 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -1333,7 +1333,12 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)
 	if (!dev)
 		return -1;
 
+	if (queue_id >= VHOST_MAX_VRING)
+		return -1;
+
 	vq = dev->virtqueue[queue_id];
+	if (!vq)
+		return -1;
 
 	rte_spinlock_lock(&vq->access_lock);
 
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:12.843697404 +0000
+++ 0042-vhost-validate-index-in-guest-notification-API.patch	2020-11-09 18:40:11.167311842 +0000
@@ -1 +1 @@
-From 366374054b656e049188216e2fa44831749c2a21 Mon Sep 17 00:00:00 2001
+From ed20f3a8ddd90b419d93d383765f6b4f6c93f3f9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 366374054b656e049188216e2fa44831749c2a21 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 193dafc369..801a1a5098 100644
+index 0f6c1ef8de..2d23de598e 100644
@@ -23 +24 @@
-@@ -1352,7 +1352,12 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)
+@@ -1333,7 +1333,12 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)