From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ADDEDA0A02 for ; Mon, 17 May 2021 18:14:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A81BA40041; Mon, 17 May 2021 18:14:07 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 5B99D410E0 for ; Mon, 17 May 2021 18:14:06 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsa-00081d-8L; Mon, 17 May 2021 16:14:04 +0000 From: Christian Ehrhardt To: Marvin Liu Cc: Maxime Coquelin , dpdk stable Date: Mon, 17 May 2021 18:08:37 +0200 Message-Id: <20210517161039.3132619-88-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix initialization of temporary header' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/31b17ff59f3b9ab51f4073f7f680faa140e47984 Thanks. Christian Ehrhardt --- >From 31b17ff59f3b9ab51f4073f7f680faa140e47984 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 7 Apr 2021 11:25:15 +0800 Subject: [PATCH] vhost: fix initialization of temporary header [ upstream commit 5b784a2d80abddd5d554b1eef534e8047b1d2e5a ] This patch fixs coverity issue by adding initialization step before using temporary virtio header. Coverity issue: 366181 Fixes: fb3815cc614d ("vhost: handle virtually non-contiguous buffers in Rx-mrg") Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- 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 a01a5c8d99..62b7bbda96 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -810,9 +810,10 @@ copy_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_DEBUG(VHOST_DATA, "(%d) RX: num merge buffers %d\n", -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.939403026 +0200 +++ 0088-vhost-fix-initialization-of-temporary-header.patch 2021-05-17 17:40:29.267810232 +0200 @@ -1 +1 @@ -From 5b784a2d80abddd5d554b1eef534e8047b1d2e5a Mon Sep 17 00:00:00 2001 +From 31b17ff59f3b9ab51f4073f7f680faa140e47984 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5b784a2d80abddd5d554b1eef534e8047b1d2e5a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7f621fb6dd..48b013a9b4 100644 +index a01a5c8d99..62b7bbda96 100644 @@ -23 +24 @@ -@@ -812,9 +812,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -810,9 +810,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, @@ -35 +36 @@ - VHOST_LOG_DATA(DEBUG, "(%d) RX: num merge buffers %d\n", + VHOST_LOG_DEBUG(VHOST_DATA, "(%d) RX: num merge buffers %d\n",