[dpdk-stable] patch 'vhost: fix initialization of async temporary header' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f Mon Sep 17 00:00:00 2001
From: Marvin Liu <yong.liu at intel.com>
Date: Wed, 7 Apr 2021 11:25:16 +0800
Subject: [PATCH] vhost: fix initialization of async temporary header
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 98da5545be5180843e61a4dacdc0612b3ae64da4 ]

This patch fixes coverity issue in async enqueue function by adding
initialization step before using temporary virtio header.

Coverity issue: 366123
Fixes: cd6760da1076 ("vhost: introduce async enqueue for split ring")

Signed-off-by: Marvin Liu <yong.liu at intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
---
 lib/librte_vhost/virtio_net.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 4b7c437764..f2392e77eb 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -1009,9 +1009,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
 
 	hdr_mbuf = m;
 	hdr_addr = buf_addr;
-	if (unlikely(buf_len < dev->vhost_hlen))
+	if (unlikely(buf_len < dev->vhost_hlen)) {
+		memset(&tmp_hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf));
 		hdr = &tmp_hdr;
-	else
+	} else
 		hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)hdr_addr;
 
 	VHOST_LOG_DATA(DEBUG, "(%d) RX: num merge buffers %d\n",
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:30.482388000 +0800
+++ 0151-vhost-fix-initialization-of-async-temporary-header.patch	2021-05-10 23:59:26.570000000 +0800
@@ -1 +1 @@
-From 98da5545be5180843e61a4dacdc0612b3ae64da4 Mon Sep 17 00:00:00 2001
+From ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 98da5545be5180843e61a4dacdc0612b3ae64da4 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 48b013a9b4..ff39878609 100644
+index 4b7c437764..f2392e77eb 100644
@@ -23 +25 @@
-@@ -986,9 +986,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
+@@ -1009,9 +1009,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,