From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 0877BA046B for ; Mon, 24 Jun 2019 17:28:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F2B7A1BCDE; Mon, 24 Jun 2019 17:28:34 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B9B2C1BCDE for ; Mon, 24 Jun 2019 17:28:33 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6466D7F7C5; Mon, 24 Jun 2019 15:28:30 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id D49F119C69; Mon, 24 Jun 2019 15:28:25 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Marko Kovacevic , Maxime Coquelin , dpdk stable Date: Mon, 24 Jun 2019 16:25:24 +0100 Message-Id: <20190624152525.19349-60-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 24 Jun 2019 15:28:33 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost/crypto: fix logically dead code' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/9a0e607513cbd7311e3dcc93840d1697e15a6cba Thanks. Kevin Traynor --- >From 9a0e607513cbd7311e3dcc93840d1697e15a6cba Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 15 May 2019 17:19:48 +0100 Subject: [PATCH] vhost/crypto: fix logically dead code [ upstream commit 1a92c9632bf8106dbf5afd0df159612cee7f6b76 ] This patch fixes a few same class bugs that causes the logically dead code in vhost_crypto. Coverity issue: 277236, 277233, 277220, 277214 Fixes: 3bb595ecd682 ("vhost/crypto: add request handler") Signed-off-by: Fan Zhang Acked-by: Marko Kovacevic Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index fc362ba98..590f5ad83 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -1018,5 +1018,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, if (unlikely(copy_data(rte_pktmbuf_mtod(m_src, uint8_t *), vc_req, &desc, chain->para.src_data_len, - nb_descs, vq_size)) < 0) { + nb_descs, vq_size) < 0)) { ret = VIRTIO_CRYPTO_BADMSG; goto error_exit; @@ -1589,5 +1589,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, if (unlikely(vhost_crypto_process_one_req(vcrypto, vq, - op, head, desc_idx)) < 0) + op, head, desc_idx) < 0)) break; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:58.152745019 +0100 +++ 0060-vhost-crypto-fix-logically-dead-code.patch 2019-06-24 16:18:55.134428792 +0100 @@ -1 +1 @@ -From 1a92c9632bf8106dbf5afd0df159612cee7f6b76 Mon Sep 17 00:00:00 2001 +From 9a0e607513cbd7311e3dcc93840d1697e15a6cba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1a92c9632bf8106dbf5afd0df159612cee7f6b76 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 0edf12d52..069b56108 100644 +index fc362ba98..590f5ad83 100644 @@ -24 +25 @@ -@@ -1025,5 +1025,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, +@@ -1018,5 +1018,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, @@ -31 +32 @@ -@@ -1599,5 +1599,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, +@@ -1589,5 +1589,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,