From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 186E84324A; Fri, 3 Nov 2023 00:50:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2C63406BA; Fri, 3 Nov 2023 00:50:05 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id EBC2F4021E for ; Fri, 3 Nov 2023 00:50:03 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A2LsUdl013078; Thu, 2 Nov 2023 16:50:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=egCNjeDN24N6HlUqtoKvW5fSFJ8U6uoA/gMc41yyl9c=; b=MLBa9Lek0BmmGKrjj+mDFXbLScNI7CZUVSmBvuwfYKtOvJv/ItUB4Rtl0dVPfktKOY51 A1xBjg1hyTehqlPkWEA7ZIW8FMLnItJNxDQ8E7LSOv5RQclr/3uw2uBYD1lL1aNcdSF8 9hFtSh5J4uZZwxCt2lF/2TX2t6r5+yfKipv8Qh721AU10tM0GLbghmv1puQrIs7i1erX 5nLUrlGcape72+OWw7J/MDZDk47zDrW1ReJDp4vZXh2IWPMN8gP795RSIUUDysE7smLy 5o1zmaT698q+3CQIckoR+6OszKGikKt29B8uHBIVvDM3Sz7QmzpZg18kK76XFVulzBLk vw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3u4m34896s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 02 Nov 2023 16:50:03 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 2 Nov 2023 16:50:01 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 2 Nov 2023 16:50:01 -0700 Received: from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34]) by maili.marvell.com (Postfix) with ESMTP id 1DFE0403B84; Thu, 2 Nov 2023 03:04:00 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: , Akhil Goyal , Kai Ji , Ciara Power , "Gowrishankar Muthukrishnan" Subject: [PATCH v2] crypto/openssl: fix memory leaks in asym ops Date: Thu, 2 Nov 2023 15:33:55 +0530 Message-ID: <83522013646bcd96b2420b3f69b74255981b3a20.1698913776.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230919130412.284-1-gmuthukrishn@marvell.com> References: <20230919130412.284-1-gmuthukrishn@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: lXpG5zzeuveW49lcDITVok1uwkXjDxs4 X-Proofpoint-GUID: lXpG5zzeuveW49lcDITVok1uwkXjDxs4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-02_10,2023-11-02_03,2023-05-22_02 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Message-ID: <20231102100355.dGwLwA-MJwQgQpHUFC6s_x6Sc3pS37p93t22nG71Y9I@z> Fix memory leaks in Asymmetric ops, as reported by valgrind. Signed-off-by: Gowrishankar Muthukrishnan --- v2: - added more fixes. --- drivers/crypto/openssl/rte_openssl_pmd.c | 38 ++++++++++++++------ drivers/crypto/openssl/rte_openssl_pmd_ops.c | 15 ++++++-- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index c234882417..5961457279 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1897,6 +1897,7 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop, size_t outlen; unsigned char *dsa_sign_data; const unsigned char *dsa_sign_data_p; + int ret = -1; cop->status = RTE_CRYPTO_OP_STATUS_ERROR; params = OSSL_PARAM_BLD_to_param(param_bld); @@ -1950,9 +1951,9 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop, cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; } + ret = 0; DSA_SIG_free(sign); OPENSSL_free(dsa_sign_data); - return 0; err_dsa_sign: if (params) @@ -1961,7 +1962,9 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop, EVP_PKEY_CTX_free(key_ctx); if (dsa_ctx) EVP_PKEY_CTX_free(dsa_ctx); - return -1; + if (pkey) + EVP_PKEY_free(pkey); + return ret; } /* process dsa verify operation */ @@ -2034,6 +2037,7 @@ process_openssl_dsa_verify_op_evp(struct rte_crypto_op *cop, ret = 0; } + OPENSSL_free(dsa_sig); err_dsa_verify: if (sign) DSA_SIG_free(sign); @@ -2043,6 +2047,10 @@ process_openssl_dsa_verify_op_evp(struct rte_crypto_op *cop, EVP_PKEY_CTX_free(key_ctx); if (dsa_ctx) EVP_PKEY_CTX_free(dsa_ctx); + if (pub_key) + BN_free(pub_key); + if (pkey) + EVP_PKEY_free(pkey); return ret; } @@ -2674,6 +2682,9 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, EVP_PKEY_CTX *kctx = NULL, *sctx = NULL, *cctx = NULL; struct rte_crypto_asym_op *op = cop->asym; OSSL_PARAM *params = sess->u.sm2.params; + EVP_MD_CTX *md_ctx = NULL; + ECDSA_SIG *ec_sign = NULL; + EVP_MD *check_md = NULL; EVP_PKEY *pkey = NULL; int ret = -1; @@ -2739,10 +2750,7 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, { unsigned char signbuf[128] = {0}; const unsigned char *signptr; - EVP_MD_CTX *md_ctx = NULL; const BIGNUM *r, *s; - ECDSA_SIG *ec_sign; - EVP_MD *check_md; size_t signlen; kctx = EVP_PKEY_CTX_new_from_name(NULL, "SM2", NULL); @@ -2800,11 +2808,8 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, break; case RTE_CRYPTO_ASYM_OP_VERIFY: { - unsigned char signbuf[128] = {0}; BIGNUM *r = NULL, *s = NULL; - EVP_MD_CTX *md_ctx = NULL; - ECDSA_SIG *ec_sign; - EVP_MD *check_md; + unsigned char *signbuf; size_t signlen; kctx = EVP_PKEY_CTX_new_from_name(NULL, "SM2", NULL); @@ -2857,13 +2862,18 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, r = NULL; s = NULL; - signlen = i2d_ECDSA_SIG(ec_sign, (unsigned char **)&signbuf); - if (signlen <= 0) + signlen = i2d_ECDSA_SIG(ec_sign, 0); + signbuf = rte_malloc(NULL, signlen, 0); + signlen = i2d_ECDSA_SIG(ec_sign, &signbuf); + if (signlen <= 0) { + rte_free(signbuf); goto err_sm2; + } if (!EVP_DigestVerifyFinal(md_ctx, signbuf, signlen)) goto err_sm2; + rte_free(signbuf); BN_free(r); BN_free(s); ECDSA_SIG_free(ec_sign); @@ -2880,6 +2890,12 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, ret = 0; cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; err_sm2: + if (check_md) + EVP_MD_free(check_md); + + if (md_ctx) + EVP_MD_CTX_free(md_ctx); + if (kctx) EVP_PKEY_CTX_free(kctx); diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index 2862c294a9..98450f36cf 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -958,9 +958,11 @@ static int openssl_set_asym_session_parameters( rsa_ctx = EVP_PKEY_CTX_new(pkey, NULL); asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_RSA; asym_session->u.r.ctx = rsa_ctx; + EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(key_ctx); + OSSL_PARAM_BLD_free(param_bld); OSSL_PARAM_free(params); - break; + ret = 0; #else RSA *rsa = RSA_new(); if (rsa == NULL) @@ -1030,7 +1032,7 @@ static int openssl_set_asym_session_parameters( } asym_session->u.r.rsa = rsa; asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_RSA; - break; + ret = 0; #endif err_rsa: BN_clear_free(n); @@ -1042,7 +1044,7 @@ static int openssl_set_asym_session_parameters( BN_clear_free(dmq1); BN_clear_free(iqmp); - return -1; + return ret; } case RTE_CRYPTO_ASYM_XFORM_MODEX: { @@ -1228,6 +1230,7 @@ static int openssl_set_asym_session_parameters( } asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DSA; asym_session->u.s.param_bld = param_bld; + BN_free(pub_key); break; #else @@ -1363,6 +1366,7 @@ static int openssl_set_asym_session_parameters( asym_session->u.sm2.params = params; OSSL_PARAM_BLD_free(param_bld); + BN_free(pkey_bn); asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_SM2; break; @@ -1373,6 +1377,8 @@ static int openssl_set_asym_session_parameters( if (asym_session->u.sm2.params) OSSL_PARAM_free(asym_session->u.sm2.params); + if (pkey_bn) + BN_free(pkey_bn); return -1; #else OPENSSL_LOG(WARNING, "SM2 unsupported in current OpenSSL Version"); @@ -1452,6 +1458,8 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess) break; case RTE_CRYPTO_ASYM_XFORM_DH: #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + OSSL_PARAM_BLD_free(sess->u.dh.param_bld); + OSSL_PARAM_BLD_free(sess->u.dh.param_bld_peer); sess->u.dh.param_bld = NULL; sess->u.dh.param_bld_peer = NULL; #else @@ -1461,6 +1469,7 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess) break; case RTE_CRYPTO_ASYM_XFORM_DSA: #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + OSSL_PARAM_BLD_free(sess->u.s.param_bld); sess->u.s.param_bld = NULL; #else if (sess->u.s.dsa) -- 2.25.1