[dpdk-stable] [DPDK 1/2] test/ipsec: fix teardown function

[dpdk-stable] [DPDK 1/2] test/ipsec: fix teardown function

[Bernard Iremonger]

Set freed cop pointers to NULL
Set other freed pointers to NULL instead of 0

Fixes: 05fe65eb66b2 ("test/ipsec: introduce functional test")
Cc: stable@dpdk.org
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test/test_ipsec.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 5389a59..2328342 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -451,8 +451,10 @@ ut_teardown(void)
 
 	for (i = 0; i < BURST_SIZE; i++) {
 		/* free crypto operation structure */
-		if (ut_params->cop[i])
+		if (ut_params->cop[i]) {
 			rte_crypto_op_free(ut_params->cop[i]);
+			ut_params->cop[i] = NULL;
+		}
 
 		/*
 		 * free mbuf - both obuf and ibuf are usually the same,
@@ -462,17 +464,17 @@ ut_teardown(void)
 		if (ut_params->obuf[i]) {
 			rte_pktmbuf_free(ut_params->obuf[i]);
 			if (ut_params->ibuf[i] == ut_params->obuf[i])
-				ut_params->ibuf[i] = 0;
-			ut_params->obuf[i] = 0;
+				ut_params->ibuf[i] = NULL;
+			ut_params->obuf[i] = NULL;
 		}
 		if (ut_params->ibuf[i]) {
 			rte_pktmbuf_free(ut_params->ibuf[i]);
-			ut_params->ibuf[i] = 0;
+			ut_params->ibuf[i] = NULL;
 		}
 
 		if (ut_params->testbuf[i]) {
 			rte_pktmbuf_free(ut_params->testbuf[i]);
-			ut_params->testbuf[i] = 0;
+			ut_params->testbuf[i] = NULL;
 		}
 	}
 
-- 
2.7.4

[dpdk-stable] [DPDK 2/2] test/ipsec: fix destroy sa function

[Bernard Iremonger]

Call rte_cryptodev_sym_session_clear() function.

Cc: stable@dpdk.org
Fixes: 05fe65eb66b2 ("test/ipsec: introduce functional test")
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test/test_ipsec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 2328342..ea558fd 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -1170,9 +1170,11 @@ static void
 destroy_sa(uint32_t j)
 {
 	struct ipsec_unitest_params *ut = &unittest_params;
+	struct ipsec_testsuite_params *ts = &testsuite_params;
 
 	rte_ipsec_sa_fini(ut->ss[j].sa);
 	rte_free(ut->ss[j].sa);
+	rte_cryptodev_sym_session_clear(ts->valid_dev, ut->ss[j].crypto.ses);
 	rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses);
 	memset(&ut->ss[j], 0, sizeof(ut->ss[j]));
 }
-- 
2.7.4