<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div class="elementToProof"><span style="font-family: "IntelOne Text"; font-size: 10pt; color: rgb(0, 0, 0);">Acked-by: Kai Ji <kai.ji@intel.com></span></div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Stephen Hemminger <stephen@networkplumber.org><br>
<b>Sent:</b> 02 November 2023 23:02<br>
<b>To:</b> dev@dpdk.org <dev@dpdk.org><br>
<b>Cc:</b> Stephen Hemminger <stephen@networkplumber.org>; Ji, Kai <kai.ji@intel.com><br>
<b>Subject:</b> [PATCH 2/2] crypto/openssl: remove unnecessary NULL checks before free</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Found with nullfree.cocci<br>
<br>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org><br>
---<br>
drivers/crypto/openssl/rte_openssl_pmd.c | 36 +++++++-------------<br>
drivers/crypto/openssl/rte_openssl_pmd_ops.c | 3 +-<br>
2 files changed, 13 insertions(+), 26 deletions(-)<br>
<br>
diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c<br>
index c234882417..090320602d 100644<br>
--- a/drivers/crypto/openssl/rte_openssl_pmd.c<br>
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c<br>
@@ -1957,10 +1957,8 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop,<br>
err_dsa_sign:<br>
if (params)<br>
OSSL_PARAM_free(params);<br>
- if (key_ctx)<br>
- EVP_PKEY_CTX_free(key_ctx);<br>
- if (dsa_ctx)<br>
- EVP_PKEY_CTX_free(dsa_ctx);<br>
+ EVP_PKEY_CTX_free(key_ctx);<br>
+ EVP_PKEY_CTX_free(dsa_ctx);<br>
return -1;<br>
}<br>
<br>
@@ -2039,10 +2037,8 @@ process_openssl_dsa_verify_op_evp(struct rte_crypto_op *cop,<br>
DSA_SIG_free(sign);<br>
if (params)<br>
OSSL_PARAM_free(params);<br>
- if (key_ctx)<br>
- EVP_PKEY_CTX_free(key_ctx);<br>
- if (dsa_ctx)<br>
- EVP_PKEY_CTX_free(dsa_ctx);<br>
+ EVP_PKEY_CTX_free(key_ctx);<br>
+ EVP_PKEY_CTX_free(dsa_ctx);<br>
<br>
return ret;<br>
}<br>
@@ -2294,16 +2290,12 @@ process_openssl_dh_op_evp(struct rte_crypto_op *cop,<br>
ret = 0;<br>
<br>
err_dh:<br>
- if (pub_key)<br>
- BN_free(pub_key);<br>
- if (priv_key)<br>
- BN_free(priv_key);<br>
+ BN_free(pub_key);<br>
+ BN_free(priv_key);<br>
if (params)<br>
OSSL_PARAM_free(params);<br>
- if (dhpkey)<br>
- EVP_PKEY_free(dhpkey);<br>
- if (peerkey)<br>
- EVP_PKEY_free(peerkey);<br>
+ EVP_PKEY_free(dhpkey);<br>
+ EVP_PKEY_free(peerkey);<br>
<br>
EVP_PKEY_CTX_free(dh_ctx);<br>
<br>
@@ -2880,17 +2872,13 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop,<br>
ret = 0;<br>
cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;<br>
err_sm2:<br>
- if (kctx)<br>
- EVP_PKEY_CTX_free(kctx);<br>
+ EVP_PKEY_CTX_free(kctx);<br>
<br>
- if (sctx)<br>
- EVP_PKEY_CTX_free(sctx);<br>
+ EVP_PKEY_CTX_free(sctx);<br>
<br>
- if (cctx)<br>
- EVP_PKEY_CTX_free(cctx);<br>
+ EVP_PKEY_CTX_free(cctx);<br>
<br>
- if (pkey)<br>
- EVP_PKEY_free(pkey);<br>
+ EVP_PKEY_free(pkey);<br>
<br>
return ret;<br>
}<br>
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c<br>
index 2862c294a9..419a767817 100644<br>
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c<br>
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c<br>
@@ -1431,8 +1431,7 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess)<br>
switch (sess->xfrm_type) {<br>
case RTE_CRYPTO_ASYM_XFORM_RSA:<br>
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)<br>
- if (sess->u.r.ctx)<br>
- EVP_PKEY_CTX_free(sess->u.r.ctx);<br>
+ EVP_PKEY_CTX_free(sess->u.r.ctx);<br>
#else<br>
if (sess->u.r.rsa)<br>
RSA_free(sess->u.r.rsa);<br>
-- <br>
2.41.0<br>
<br>
</div>
</span></font></div>
</body>
</html>