From 2680b69c7bd577ac07c799304eb21bc8e72fc4cd Mon Sep 17 00:00:00 2001 From: Akash Saxena Date: Fri, 23 Nov 2018 12:10:59 +0000 Subject: [PATCH] crypto/openssl: remove useless check before freeing Remove if() condition prior to calling BN_free() as BN_free(a) does nothing if a is NULL. Signed-off-by: Akash Saxena Signed-off-by: Shally Verma Acked-by: Akhil Goyal --- drivers/crypto/openssl/rte_openssl_pmd.c | 21 +++------ drivers/crypto/openssl/rte_openssl_pmd_ops.c | 45 +++++++------------- 2 files changed, 22 insertions(+), 44 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 11ea0d1900..a0ccacb1e4 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1605,12 +1605,9 @@ process_openssl_dsa_verify_op(struct rte_crypto_op *cop, op->y.length, pub_key); if (!r || !s || !pub_key) { - if (r) - BN_free(r); - if (s) - BN_free(s); - if (pub_key) - BN_free(pub_key); + BN_free(r); + BN_free(s); + BN_free(pub_key); cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; return -1; @@ -1781,10 +1778,8 @@ process_openssl_modinv_op(struct rte_crypto_op *cop, BIGNUM *res = BN_CTX_get(sess->u.m.ctx); if (unlikely(base == NULL || res == NULL)) { - if (base) - BN_free(base); - if (res) - BN_free(res); + BN_free(base); + BN_free(res); cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; return -1; } @@ -1812,10 +1807,8 @@ process_openssl_modexp_op(struct rte_crypto_op *cop, BIGNUM *res = BN_CTX_get(sess->u.e.ctx); if (unlikely(base == NULL || res == NULL)) { - if (base) - BN_free(base); - if (res) - BN_free(res); + BN_free(base); + BN_free(res); cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; return -1; } diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index c2b029ec26..bdaf937a3e 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -906,22 +906,14 @@ static int openssl_set_asym_session_parameters( asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_RSA; break; err_rsa: - if (n) - BN_free(n); - if (e) - BN_free(e); - if (d) - BN_free(d); - if (p) - BN_free(p); - if (q) - BN_free(q); - if (dmp1) - BN_free(dmp1); - if (dmq1) - BN_free(dmq1); - if (iqmp) - BN_free(iqmp); + BN_free(n); + BN_free(e); + BN_free(d); + BN_free(p); + BN_free(q); + BN_free(dmp1); + BN_free(dmq1); + BN_free(iqmp); return -1; } @@ -1043,10 +1035,8 @@ err_rsa: err_dh: OPENSSL_LOG(ERR, " failed to set dh params\n"); - if (p) - BN_free(p); - if (g) - BN_free(g); + BN_free(p); + BN_free(g); return -1; } case RTE_CRYPTO_ASYM_XFORM_DSA: @@ -1112,16 +1102,11 @@ err_dh: break; err_dsa: - if (p) - BN_free(p); - if (q) - BN_free(q); - if (g) - BN_free(g); - if (priv_key) - BN_free(priv_key); - if (pub_key) - BN_free(pub_key); + BN_free(p); + BN_free(q); + BN_free(g); + BN_free(priv_key); + BN_free(pub_key); return -1; } default: -- 2.20.1