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 F2350436D1 for ; Tue, 12 Dec 2023 13:10:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC3B142E18; Tue, 12 Dec 2023 13:10:48 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id C632842DB2 for ; Tue, 12 Dec 2023 13:10:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702383047; x=1733919047; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=SvtDwcYXDABCWj5X4q822vjoZL7u5v2QIYqJZLhukus=; b=nYZ/dSvwNm6hTUopUJy6I4H3tOZu6PkjrfK0BPUxZ22qKj0T41hNIEq0 p4Gqc6hU3Kb05oY2SnSIJlbQnm2qo2dSNe52L9oy36kwpoBfnQbsCd9iu 5sjUC8xJQjaRPUU6kQ6qn2MS9b7SS28XFAklU4Q2HFKRrcp5sKsVhh3mW buh4LE3SoG7r/s3vMDfiG6glGc8MIVq2PBMiO/x7utUAHZewvij/lQ13l qYcgoE7vISe65onX9A1z5gz7qAfVvDdNmiv+w4V/uKc6kk2SXk8+ZnIqN Bo+vw2qtsSYQAgHmnGNZokDg4ZHHn306yBwZxj0mxBuEI702UKF5DoqeG g==; X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="461270827" X-IronPort-AV: E=Sophos;i="6.04,270,1695711600"; d="scan'208";a="461270827" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 04:10:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="749709525" X-IronPort-AV: E=Sophos;i="6.04,270,1695711600"; d="scan'208";a="749709525" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by orsmga006.jf.intel.com with ESMTP; 12 Dec 2023 04:10:45 -0800 From: Ciara Power To: xuemingl@nvidia.com Cc: stable@dpdk.org, Ciara Power , Kai Ji Subject: [PATCH 22.11] crypto/openssl: fix memory leaks in asym session Date: Tue, 12 Dec 2023 12:10:42 +0000 Message-Id: <20231212121042.3180007-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [upstream commit 47a85dda3f06 ] Numerous memory leaks were detected by ASAN in the OpenSSL PMD asymmetric code path. These are now fixed to free all variables allocated by OpenSSL functions such as BN_bin2bn and OSSL_PARAM_BLD_new. Some need to exist until the op is processed, for example the BIGNUMs associated with DSA. The pointers for these are added to the private asym session so they can be accessed later when calling free. Some cases need to be treated differently if OpenSSL < 3.0. It has slightly different handling of memory, as functions such as RSA_set0_key() take over memory management of values, so the caller should not free the values. Fixes: 4c7ae22f1f83 ("crypto/openssl: update DSA routine with 3.0 EVP API") Fixes: c794b40c9258 ("crypto/openssl: update DH routine with 3.0 EVP API") Fixes: ac42813a0a7c ("crypto/openssl: add DH and DSA asym operations") Fixes: d7bd42f6db19 ("crypto/openssl: update RSA routine with 3.0 EVP API") Signed-off-by: Ciara Power --- drivers/crypto/openssl/openssl_pmd_private.h | 6 ++ drivers/crypto/openssl/rte_openssl_pmd.c | 1 + drivers/crypto/openssl/rte_openssl_pmd_ops.c | 96 +++++++++++++------- 3 files changed, 72 insertions(+), 31 deletions(-) diff --git a/drivers/crypto/openssl/openssl_pmd_private.h b/drivers/crypto/openssl/openssl_pmd_private.h index ed6841e460..4e224b040b 100644 --- a/drivers/crypto/openssl/openssl_pmd_private.h +++ b/drivers/crypto/openssl/openssl_pmd_private.h @@ -189,6 +189,8 @@ struct openssl_asym_session { struct dh { DH *dh_key; uint32_t key_op; + BIGNUM *p; + BIGNUM *g; #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) OSSL_PARAM_BLD * param_bld; OSSL_PARAM_BLD *param_bld_peer; @@ -198,6 +200,10 @@ struct openssl_asym_session { DSA *dsa; #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) OSSL_PARAM_BLD * param_bld; + BIGNUM *p; + BIGNUM *g; + BIGNUM *q; + BIGNUM *priv_key; #endif } s; } u; diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 6825b0469e..6ae31cb5cd 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1960,6 +1960,7 @@ 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); + EVP_PKEY_free(pkey); return -1; } diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index defed4429e..24d6d48262 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -1087,22 +1087,21 @@ static int openssl_set_asym_session_parameters( } case RTE_CRYPTO_ASYM_XFORM_DH: { - BIGNUM *p = NULL; - BIGNUM *g = NULL; - - p = BN_bin2bn((const unsigned char *) + DH *dh = NULL; +#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + BIGNUM **p = &asym_session->u.dh.p; + BIGNUM **g = &asym_session->u.dh.g; + *p = BN_bin2bn((const unsigned char *) xform->dh.p.data, xform->dh.p.length, - p); - g = BN_bin2bn((const unsigned char *) + *p); + *g = BN_bin2bn((const unsigned char *) xform->dh.g.data, xform->dh.g.length, - g); - if (!p || !g) + *g); + if (!*p || !*g) goto err_dh; - DH *dh = NULL; -#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) OSSL_PARAM_BLD *param_bld = NULL; param_bld = OSSL_PARAM_BLD_new(); if (!param_bld) { @@ -1112,9 +1111,9 @@ static int openssl_set_asym_session_parameters( if ((!OSSL_PARAM_BLD_push_utf8_string(param_bld, "group", "ffdhe2048", 0)) || (!OSSL_PARAM_BLD_push_BN(param_bld, - OSSL_PKEY_PARAM_FFC_P, p)) + OSSL_PKEY_PARAM_FFC_P, *p)) || (!OSSL_PARAM_BLD_push_BN(param_bld, - OSSL_PKEY_PARAM_FFC_G, g))) { + OSSL_PKEY_PARAM_FFC_G, *g))) { OSSL_PARAM_BLD_free(param_bld); goto err_dh; } @@ -1129,9 +1128,9 @@ static int openssl_set_asym_session_parameters( if ((!OSSL_PARAM_BLD_push_utf8_string(param_bld_peer, "group", "ffdhe2048", 0)) || (!OSSL_PARAM_BLD_push_BN(param_bld_peer, - OSSL_PKEY_PARAM_FFC_P, p)) + OSSL_PKEY_PARAM_FFC_P, *p)) || (!OSSL_PARAM_BLD_push_BN(param_bld_peer, - OSSL_PKEY_PARAM_FFC_G, g))) { + OSSL_PKEY_PARAM_FFC_G, *g))) { OSSL_PARAM_BLD_free(param_bld); OSSL_PARAM_BLD_free(param_bld_peer); goto err_dh; @@ -1140,6 +1139,20 @@ static int openssl_set_asym_session_parameters( asym_session->u.dh.param_bld = param_bld; asym_session->u.dh.param_bld_peer = param_bld_peer; #else + BIGNUM *p = NULL; + BIGNUM *g = NULL; + + p = BN_bin2bn((const unsigned char *) + xform->dh.p.data, + xform->dh.p.length, + p); + g = BN_bin2bn((const unsigned char *) + xform->dh.g.data, + xform->dh.g.length, + g); + if (!p || !g) + goto err_dh; + dh = DH_new(); if (dh == NULL) { OPENSSL_LOG(ERR, @@ -1158,41 +1171,48 @@ static int openssl_set_asym_session_parameters( err_dh: OPENSSL_LOG(ERR, " failed to set dh params\n"); +#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + BN_free(*p); + BN_free(*g); +#else BN_free(p); BN_free(g); +#endif return -1; } case RTE_CRYPTO_ASYM_XFORM_DSA: { #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) - BIGNUM *p = NULL, *g = NULL; - BIGNUM *q = NULL, *priv_key = NULL; + BIGNUM **p = &asym_session->u.s.p; + BIGNUM **g = &asym_session->u.s.g; + BIGNUM **q = &asym_session->u.s.q; + BIGNUM **priv_key = &asym_session->u.s.priv_key; BIGNUM *pub_key = BN_new(); BN_zero(pub_key); OSSL_PARAM_BLD *param_bld = NULL; - p = BN_bin2bn((const unsigned char *) + *p = BN_bin2bn((const unsigned char *) xform->dsa.p.data, xform->dsa.p.length, - p); + *p); - g = BN_bin2bn((const unsigned char *) + *g = BN_bin2bn((const unsigned char *) xform->dsa.g.data, xform->dsa.g.length, - g); + *g); - q = BN_bin2bn((const unsigned char *) + *q = BN_bin2bn((const unsigned char *) xform->dsa.q.data, xform->dsa.q.length, - q); - if (!p || !q || !g) + *q); + if (!*p || !*q || !*g) goto err_dsa; - priv_key = BN_bin2bn((const unsigned char *) + *priv_key = BN_bin2bn((const unsigned char *) xform->dsa.x.data, xform->dsa.x.length, - priv_key); - if (priv_key == NULL) + *priv_key); + if (*priv_key == NULL) goto err_dsa; param_bld = OSSL_PARAM_BLD_new(); @@ -1201,10 +1221,11 @@ static int openssl_set_asym_session_parameters( goto err_dsa; } - if (!OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_P, p) - || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_G, g) - || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_Q, q) - || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_PRIV_KEY, priv_key)) { + if (!OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_P, *p) + || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_G, *g) + || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_FFC_Q, *q) + || !OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_PRIV_KEY, + *priv_key)) { OSSL_PARAM_BLD_free(param_bld); OPENSSL_LOG(ERR, "failed to allocate resources\n"); goto err_dsa; @@ -1268,18 +1289,25 @@ static int openssl_set_asym_session_parameters( if (ret) { DSA_free(dsa); OPENSSL_LOG(ERR, "Failed to set keys\n"); - return -1; + goto err_dsa; } asym_session->u.s.dsa = dsa; asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DSA; break; #endif err_dsa: +#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + BN_free(*p); + BN_free(*q); + BN_free(*g); + BN_free(*priv_key); +#else BN_free(p); BN_free(q); BN_free(g); BN_free(priv_key); BN_free(pub_key); +#endif return -1; } default: @@ -1357,10 +1385,16 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess) if (sess->u.dh.dh_key) DH_free(sess->u.dh.dh_key); #endif + BN_clear_free(sess->u.dh.p); + BN_clear_free(sess->u.dh.g); break; case RTE_CRYPTO_ASYM_XFORM_DSA: #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) sess->u.s.param_bld = NULL; + BN_clear_free(sess->u.s.p); + BN_clear_free(sess->u.s.q); + BN_clear_free(sess->u.s.g); + BN_clear_free(sess->u.s.priv_key); #else if (sess->u.s.dsa) DSA_free(sess->u.s.dsa); -- 2.25.1