[dpdk-stable] patch 'vhost/crypto: fix parens' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Thu Apr 25 17:40:03 CEST 2019


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 <roy.fan.zhang at intel.com>
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 <roy.fan.zhang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 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 at 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,


More information about the stable mailing list