Skip to contentSkip to conversation

examples/fips_validation: fix logically dead code

PATCH Applied Fan Zhang 3 participants 3 messages May 15, 2019 – Jun 19, 2019

lore
Share & tools
lore

Fan Zhang

author
#0 lore raw

PATCH 1/1 examples/fips_validation: fix logically dead code

Coverity issue: 336866
Coverity issue: 336841
Coverity issue: 336838

Fixes 41d561cbdd24 ("examples/fips_validation: add power on self test")
---
 examples/fips_validation/fips_dev_self_test.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
examples/fips_validation/fips_dev_self_test.c +12 -3
index df1c0e82e..444bbaa79 100644
@@ -1333,6 +1333,9 @@ check_cipher_result(struct rte_crypto_op *op,
 	uint32_t len, src_len;
 	int ret;
 
+	if (!mbuf)
+		return -1;
+
 	if (dir == self_test_dir_enc_auth_gen) {
 		src = vec->output.data;
 		src_len = vec->output.len;
@@ -1342,7 +1345,7 @@ check_cipher_result(struct rte_crypto_op *op,
 	}
 
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	ret = memcmp(data, src, src_len);
@@ -1362,8 +1365,11 @@ check_auth_result(struct rte_crypto_op *op,
 	uint32_t len;
 	int ret;
 
+	if (mbuf == NULL)
+		return -1;
+
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	if (dir == self_test_dir_enc_auth_gen) {
@@ -1387,6 +1393,9 @@ check_aead_result(struct rte_crypto_op *op,
 	uint32_t len, src_len;
 	int ret;
 
+	if (!mbuf)
+		return -1;
+
 	if (op->sym->aead.aad.data)
 		rte_free(op->sym->aead.aad.data);
 
@@ -1399,7 +1408,7 @@ check_aead_result(struct rte_crypto_op *op,
 	}
 
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	ret = memcmp(data, src, src_len);
Signature · 1 line
2.14.5
Acked-by on v1 1/1
#1 lore raw
Quoted 61 lines

Subject: [dpdk-dev] [PATCH] examples/fips_validation: fix logically dead code

Coverity issue: 336866
Coverity issue: 336841
Coverity issue: 336838

Fixes 41d561cbdd24 ("examples/fips_validation: add power on self test")
---
 examples/fips_validation/fips_dev_self_test.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
examples/fips_validation/fips_dev_self_test.c +8 -2
index df1c0e82e..444bbaa79 100644
@@ -1333,6 +1333,9 @@ check_cipher_result(struct rte_crypto_op *op,
 	uint32_t len, src_len;
 	int ret;
 
+	if (!mbuf)
+		return -1;
+
 	if (dir == self_test_dir_enc_auth_gen) {
 		src = vec->output.data;
 		src_len = vec->output.len;
@@ -1342,7 +1345,7 @@ check_cipher_result(struct rte_crypto_op *op,
 	}
 
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	ret = memcmp(data, src, src_len);
@@ -1362,8 +1365,11 @@ check_auth_result(struct rte_crypto_op *op,
 	uint32_t len;
 	int ret;
 
+	if (mbuf == NULL)
+		return -1;
+
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	if (dir == self_test_dir_enc_auth_gen) { @@ -1387,6 +1393,9 @@

check_aead_result(struct rte_crypto_op *op,

examples/fips_validation/fips_dev_self_test.c +3 -0
 	uint32_t len, src_len;
 	int ret;
 
+	if (!mbuf)
+		return -1;
+
 	if (op->sym->aead.aad.data)
 		rte_free(op->sym->aead.aad.data);

examples/fips_validation/fips_dev_self_test.c check_aead_result(struct rte_crypto_op *op,

Quoted 9 lines
examples/fips_validation/fips_dev_self_test.c +1 -2
@@ -1399,7 +1408,7 @@ check_aead_result(struct rte_crypto_op *op,
 	}
 
 	GET_MBUF_DATA(data, len, mbuf);
-	if (!data && !len)
+	if (!len)
 		return -1;
 
 	ret = memcmp(data, src, src_len);
--