patch 'test/crypto: fix wireless auth digest segment' has been queued to stable release 19.11.14

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Nov 11 12:39:02 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.14

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/18/22. 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/414eb9ff5a6868a52c70ce5b95a9ee15d32219ec

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 414eb9ff5a6868a52c70ce5b95a9ee15d32219ec Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 7 Oct 2022 13:46:50 +0000
Subject: [PATCH] test/crypto: fix wireless auth digest segment

[ upstream commit dc3f6c5347b2b64899694c2f94a6af53c95d2b4d ]

The segment size for some tests was too small to hold the auth digest.
This caused issues when using op->sym->auth.digest.data for comparisons
in AESNI_MB PMD after a subsequent patch enables SGL.

For example, if segment size is 2, and digest size is 4, then 4 bytes
are read from op->sym->auth.digest.data, which overflows into the memory
after the segment, rather than using the second segment that contains
the remaining half of the digest.

Fixes: 11c5485bb276 ("test/crypto: add scatter-gather tests for IP and OOP")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 app/test/test_cryptodev.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 279cf8b07c..e23a68e0b1 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -3121,6 +3121,16 @@ create_wireless_algo_auth_cipher_operation(
 			remaining_off -= rte_pktmbuf_data_len(sgl_buf);
 			sgl_buf = sgl_buf->next;
 		}
+
+		/* The last segment should be large enough to hold full digest */
+		if (sgl_buf->data_len < auth_tag_len) {
+			rte_pktmbuf_free(sgl_buf->next);
+			sgl_buf->next = NULL;
+			TEST_ASSERT_NOT_NULL(rte_pktmbuf_append(sgl_buf,
+					auth_tag_len - sgl_buf->data_len),
+					"No room to append auth tag");
+		}
+
 		sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(sgl_buf,
 				uint8_t *, remaining_off);
 		sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(sgl_buf,
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:06.347891877 +0100
+++ 0045-test-crypto-fix-wireless-auth-digest-segment.patch	2022-11-11 12:35:04.813192283 +0100
@@ -1 +1 @@
-From dc3f6c5347b2b64899694c2f94a6af53c95d2b4d Mon Sep 17 00:00:00 2001
+From 414eb9ff5a6868a52c70ce5b95a9ee15d32219ec Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dc3f6c5347b2b64899694c2f94a6af53c95d2b4d ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index c6d47a035e..203b8b61fa 100644
+index 279cf8b07c..e23a68e0b1 100644
@@ -29 +30 @@
-@@ -2990,6 +2990,16 @@ create_wireless_algo_auth_cipher_operation(
+@@ -3121,6 +3121,16 @@ create_wireless_algo_auth_cipher_operation(


More information about the stable mailing list