patch 'test/crypto: fix null check for ZUC authentication' has been queued to stable release 19.11.13

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Thu Jul 7 09:54:26 CEST 2022


Hi,

FYI, your patch has been queued to stable release 19.11.13

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From e78ce8dd2376de008374c9f14f2bd43e3b8d955d Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Wed, 11 May 2022 13:29:24 +0000
Subject: [PATCH] test/crypto: fix null check for ZUC authentication

[ upstream commit e6d37ffa69ac7fb4eec9580af5b005e6c130b79d ]

Check if the returned op is NULL because of failure,
before using it and causing a segmentation fault.

Fixes: 4c99481f49c4 ("app/test: add ZUC")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 app/test/test_cryptodev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index c1fee16861..7ecfe8fac0 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -4591,9 +4591,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
 	if (retval < 0)
 		return retval;
 
+	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
 			ut_params->op);
-	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 	ut_params->obuf = ut_params->op->sym->m_src;
 	if (ut_params->obuf)
 		ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:12.521388243 +0200
+++ 0031-test-crypto-fix-null-check-for-ZUC-authentication.patch	2022-07-07 09:54:10.853823925 +0200
@@ -1 +1 @@
-From e6d37ffa69ac7fb4eec9580af5b005e6c130b79d Mon Sep 17 00:00:00 2001
+From e78ce8dd2376de008374c9f14f2bd43e3b8d955d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e6d37ffa69ac7fb4eec9580af5b005e6c130b79d ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index f444144cc6..4ffaadc008 100644
+index c1fee16861..7ecfe8fac0 100644
@@ -22,9 +23,3 @@
-@@ -6238,8 +6238,8 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
- 	else
- 		ut_params->op = process_crypto_request(ts_params->valid_devs[0],
- 				ut_params->op);
--	ut_params->obuf = ut_params->op->sym->m_src;
- 	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-+	ut_params->obuf = ut_params->op->sym->m_src;
- 	ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
- 			+ plaintext_pad_len;
+@@ -4591,9 +4591,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
+ 	if (retval < 0)
+ 		return retval;
@@ -31,0 +27,7 @@
++	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+ 	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+ 			ut_params->op);
+-	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+ 	ut_params->obuf = ut_params->op->sym->m_src;
+ 	if (ut_params->obuf)
+ 		ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);


More information about the stable mailing list