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 581DBA05D3 for ; Thu, 25 Apr 2019 17:41:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4E7B51B5D8; Thu, 25 Apr 2019 17:41:30 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C8E261B5E9 for ; Thu, 25 Apr 2019 17:41:28 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CB337DCC4; Thu, 25 Apr 2019 15:41:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A2875D9C6; Thu, 25 Apr 2019 15:41:27 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Thu, 25 Apr 2019 16:40:03 +0100 Message-Id: <20190425154037.28778-28-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 25 Apr 2019 15:41:28 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost/crypto: fix parens' has been queued to LTS release 18.11.2 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.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/01/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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 122f4fc54238905be2b86254a61536c710f04e87 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 25 Mar 2019 14:37:31 +0000 Subject: [PATCH] vhost/crypto: fix parens [ upstream commit bc5560c15e74d66b019b4bbbd5573519b0a462c3 ] Coverity issue: 277214, 277220, 277233, 277236 Fixes: cd1e8f03abf0 ("vhost/crypto: fix packet copy in chaining mode") Signed-off-by: Fan Zhang 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 0694c0a74..fc362ba98 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -1103,5 +1103,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, if (unlikely(copy_data(digest_addr, vc_req, &digest_desc, chain->para.hash_result_len, - nb_descs, vq_size)) < 0) { + nb_descs, vq_size) < 0)) { ret = VIRTIO_CRYPTO_BADMSG; goto error_exit; @@ -1618,5 +1618,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-04-25 16:37:47.978277621 +0100 +++ 0028-vhost-crypto-fix-parens.patch 2019-04-25 16:37:46.737295132 +0100 @@ -1 +1 @@ -From bc5560c15e74d66b019b4bbbd5573519b0a462c3 Mon Sep 17 00:00:00 2001 +From 122f4fc54238905be2b86254a61536c710f04e87 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc5560c15e74d66b019b4bbbd5573519b0a462c3 ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 9b4b850e8..0edf12d52 100644 +index 0694c0a74..fc362ba98 100644 @@ -20 +21 @@ -@@ -1110,5 +1110,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, +@@ -1103,5 +1103,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op, @@ -27 +28 @@ -@@ -1628,5 +1628,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, +@@ -1618,5 +1618,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,