From: "Trahe, Fiona" <fiona.trahe@intel.com>
To: Yong Wang <wang.yong19@zte.com.cn>,
"Xing, Beilei" <beilei.xing@intel.com>,
"Lu, Wenzhuo" <wenzhuo.lu@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "Trahe, Fiona" <fiona.trahe@intel.com>
Subject: Re: [dpdk-dev] [PATCH v3 3/3] crypto/qat: add null point check and fix mem leak
Date: Tue, 23 Jan 2018 12:16:17 +0000 [thread overview]
Message-ID: <348A99DA5F5B7549AA880327E580B435892FF3F9@IRSMSX101.ger.corp.intel.com> (raw)
In-Reply-To: <1516675500-10878-3-git-send-email-wang.yong19@zte.com.cn>
Hi Yong,
> -----Original Message-----
> From: Yong Wang [mailto:wang.yong19@zte.com.cn]
> Sent: Tuesday, January 23, 2018 2:45 AM
> To: Xing, Beilei <beilei.xing@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Trahe, Fiona
> <fiona.trahe@intel.com>
> Cc: dev@dpdk.org; Yong Wang <wang.yong19@zte.com.cn>
> Subject: [PATCH v3 3/3] crypto/qat: add null point check and fix mem leak
>
> There are several func calls to rte_zmalloc() which don't do null
> point check on the return value. And before return, the memory is not
> freed. Fix it by adding null point check and rte_free().
>
> Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
> ---
> v3:
> * Rebase on master and modify again.
> v2:
> * Fix code style warning.
> ---
> drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 10 ++++++++++
> drivers/crypto/qat/qat_qp.c | 8 +++++++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> index db6c9a3..26f854c 100644
> --- a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> +++ b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> @@ -359,6 +359,11 @@ static int qat_alg_do_precomputes(enum icp_qat_hw_auth_algo hash_alg,
>
> in = rte_zmalloc("working mem for key",
> ICP_QAT_HW_AES_XCBC_MAC_STATE2_SZ, 16);
> + if (in == NULL) {
> + PMD_DRV_LOG(ERR, "Failed to alloc memory");
> + return -ENOMEM;
> + }
> +
> rte_memcpy(in, qat_aes_xcbc_key_seed,
> ICP_QAT_HW_AES_XCBC_MAC_STATE2_SZ);
> for (x = 0; x < HASH_XCBC_PRECOMP_KEY_NUM; x++) {
> @@ -389,6 +394,11 @@ static int qat_alg_do_precomputes(enum icp_qat_hw_auth_algo hash_alg,
> ICP_QAT_HW_GALOIS_E_CTR0_SZ);
> in = rte_zmalloc("working mem for key",
> ICP_QAT_HW_GALOIS_H_SZ, 16);
> + if (in == NULL) {
> + PMD_DRV_LOG(ERR, "Failed to alloc memory");
> + return -ENOMEM;
> + }
> +
> memset(in, 0, ICP_QAT_HW_GALOIS_H_SZ);
> if (AES_set_encrypt_key(auth_key, auth_keylen << 3,
> &enc_key) != 0) {
> diff --git a/drivers/crypto/qat/qat_qp.c b/drivers/crypto/qat/qat_qp.c
> index 0941a58..812dce9 100644
> --- a/drivers/crypto/qat/qat_qp.c
> +++ b/drivers/crypto/qat/qat_qp.c
> @@ -151,6 +151,11 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t
> queue_pair_id,
> qp->op_cookies = rte_zmalloc("qat PMD op cookie pointer",
> qp_conf->nb_descriptors * sizeof(*qp->op_cookies),
> RTE_CACHE_LINE_SIZE);
> + if (qp->op_cookies == NULL) {
> + PMD_DRV_LOG(ERR, "Failed to alloc mem for cookie");
> + rte_free(qp);
> + return -ENOMEM;
> + }
>
> qp->mmap_bar_addr = pci_dev->mem_resource[0].addr;
> qp->inflights16 = 0;
> @@ -192,7 +197,7 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
> for (i = 0; i < qp->nb_descriptors; i++) {
> if (rte_mempool_get(qp->op_cookie_pool, &qp->op_cookies[i])) {
> PMD_DRV_LOG(ERR, "QAT PMD Cannot get op_cookie");
> - return -EFAULT;
> + goto create_err;
> }
>
> struct qat_crypto_op_cookie *sql_cookie =
> @@ -217,6 +222,7 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
> return 0;
>
> create_err:
[Fiona] Thanks for this - it was on my backlog to fix :)
Can you add following too, to cover errors that happen after the rte_mempool_create
if (qp->op_cookie_pool)
rte_mempool_free(qp->op_cookie_pool);
> + rte_free(qp->op_cookies);
> rte_free(qp);
> return -EFAULT;
> }
> --
> 1.8.3.1
next prev parent reply other threads:[~2018-01-23 12:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 2:44 [dpdk-dev] [PATCH v3 1/3] net/i40e: " Yong Wang
2018-01-23 2:44 ` [dpdk-dev] [PATCH v3 2/3] net/e1000: add null point check for rte_zmalloc Yong Wang
2018-01-23 2:45 ` [dpdk-dev] [PATCH v3 3/3] crypto/qat: add null point check and fix mem leak Yong Wang
2018-01-23 12:16 ` [dpdk-dev] [PATCH v3 3/3] crypto/qat: hebing " Trahe, Fiona
2018-01-23 12:16 ` Trahe, Fiona [this message]
2018-01-24 8:41 ` [dpdk-dev] [PATCH v3 1/3] net/i40e: " Zhang, Helin
2018-01-24 9:28 ` [dpdk-dev] 答复: RE: [PATCH v3 1/3] net/i40e: add null point check andfix " wang.yong19
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=348A99DA5F5B7549AA880327E580B435892FF3F9@IRSMSX101.ger.corp.intel.com \
--to=fiona.trahe@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=wang.yong19@zte.com.cn \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).