[dpdk-stable] patch 'vhost: fix possible out of bound access in vector filling' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

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

Thanks.

Kevin Traynor

---
>From 98f3d3de13c66bba2234bc17447591d7102b9d38 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Fri, 4 Jan 2019 12:06:40 +0800
Subject: [PATCH] vhost: fix possible out of bound access in vector filling

[ upstream commit 06fc8545fd6302f70de9ef5008a204e467d8cedb ]

Fixes: 7f74b95c444f ("vhost: pre update used ring for Tx and Rx")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/virtio_net.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 68b72e7a5..8ddee4ca5 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -339,4 +339,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
 	struct vring_desc *idesc = NULL;
 
+	if (unlikely(idx >= vq->size))
+		return -1;
+
 	*desc_chain_head = idx;
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.330307530 +0000
+++ 0025-vhost-fix-possible-out-of-bound-access-in-vector-fil.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,10 +1,11 @@
-From 06fc8545fd6302f70de9ef5008a204e467d8cedb Mon Sep 17 00:00:00 2001
+From 98f3d3de13c66bba2234bc17447591d7102b9d38 Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Fri, 4 Jan 2019 12:06:40 +0800
 Subject: [PATCH] vhost: fix possible out of bound access in vector filling
 
+[ upstream commit 06fc8545fd6302f70de9ef5008a204e467d8cedb ]
+
 Fixes: 7f74b95c444f ("vhost: pre update used ring for Tx and Rx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -13,10 +14,10 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
-index 474acf64d..d64c355b9 100644
+index 68b72e7a5..8ddee4ca5 100644
 --- a/lib/librte_vhost/virtio_net.c
 +++ b/lib/librte_vhost/virtio_net.c
-@@ -313,4 +313,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
+@@ -339,4 +339,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
  	struct vring_desc *idesc = NULL;
  
 +	if (unlikely(idx >= vq->size))