patch 'common/cpt: fix KASUMI input length' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0619333182a0429a6450bd41324c0c12158c7e92 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj at marvell.com>
Date: Thu, 11 Nov 2021 17:18:42 +0530
Subject: [PATCH] common/cpt: fix KASUMI input length
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d937e872023373266e21784027938851533c6459 ]

Fix kasumi input len calculation to consider encr_offset.

Fixes: da39e3eccd3d ("common/cpt: support KASUMI")

Signed-off-by: Anoob Joseph <anoobj at marvell.com>
---
 drivers/common/cpt/cpt_ucode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 0536620710..9c22ee75d2 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -2248,7 +2248,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs,
 	/* consider iv len */
 	encr_offset += iv_len;
 
-	inputlen = iv_len + (RTE_ALIGN(encr_data_len, 8) / 8);
+	inputlen = encr_offset + (RTE_ALIGN(encr_data_len, 8) / 8);
 	outputlen = inputlen;
 
 	/* save space for offset ctrl & iv */
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:05.146807681 +0800
+++ 0034-common-cpt-fix-KASUMI-input-length.patch	2021-11-28 22:41:03.273541825 +0800
@@ -1 +1 @@
-From d937e872023373266e21784027938851533c6459 Mon Sep 17 00:00:00 2001
+From 0619333182a0429a6450bd41324c0c12158c7e92 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d937e872023373266e21784027938851533c6459 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -17 +19 @@
-index 006411cd89..e015cf66a1 100644
+index 0536620710..9c22ee75d2 100644
@@ -20 +22 @@
-@@ -2311,7 +2311,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs,
+@@ -2248,7 +2248,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs,