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

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 7ea44ec66464de70eb339b39d521aa58bd35ad74 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 8c0c1b4bb..3e2935992 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -569,6 +569,9 @@ fill_vec_buf(struct virtio_net *dev, struct vhost_virtqueue *vq,
 	struct vring_desc *descs = vq->desc;
 	struct vring_desc *idesc = NULL;
 
+	if (unlikely(idx >= vq->size))
+		return -1;
+
 	*desc_chain_head = idx;
 
 	if (vq->desc[idx].flags & VRING_DESC_F_INDIRECT) {
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:41.979464471 -0800
+++ 0034-vhost-fix-possible-out-of-bound-access-in-vector-fil.patch	2019-03-08 09:46:40.153400000 -0800
@@ -1,10 +1,11 @@
-From 06fc8545fd6302f70de9ef5008a204e467d8cedb Mon Sep 17 00:00:00 2001
+From 7ea44ec66464de70eb339b39d521aa58bd35ad74 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 8c0c1b4bb..3e2935992 100644
 --- a/lib/librte_vhost/virtio_net.c
 +++ b/lib/librte_vhost/virtio_net.c
-@@ -312,6 +312,9 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
+@@ -569,6 +569,9 @@ fill_vec_buf(struct virtio_net *dev, struct vhost_virtqueue *vq,
  	struct vring_desc *descs = vq->desc;
  	struct vring_desc *idesc = NULL;