From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.217.80.70]) by dpdk.org (Postfix) with ESMTP id 3F2901B22A for ; Fri, 26 Jan 2018 04:16:24 +0100 (CET) Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 143E74895EB7231E9D3A for ; Fri, 26 Jan 2018 11:16:23 +0800 (CST) Received: from [127.0.0.1] ([10.30.12.226]) by mse01.zte.com.cn with ESMTP id w0Q3GAPv074050 for ; Fri, 26 Jan 2018 11:16:10 +0800 (GMT-8) (envelope-from wang.yong19@zte.com.cn) Message-Id: <201801260316.w0Q3GAPv074050@mse01.zte.com.cn> Received: from mgapp02.zte.com.cn (unknown [10.36.9.143]) by smtp (Zmail) with SMTP; Tue, 23 Jan 2018 20:16:25 +0800 X-Zmail-TransId: 3e835a672798001-ddec1 X-Zmail-Original-Info: 8-81-0-31812-827666326-3e825a67279800045356 X-Zmail-Cross-Node: 8 Received: from mxus.zte.com.cn (unknown [10.36.11.22]) by smtp (Zmail) with SMTP; Tue, 23 Jan 2018 20:16:24 +0800 X-Zmail-TransId: 3e825a672798000-45356 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by Forcepoint Email with ESMTPS id D55FFA9C617C7FF9E6BA for ; Tue, 23 Jan 2018 20:16:23 +0800 (CST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2018 04:16:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,401,1511856000"; d="scan'208";a="13484305" Received: from irsmsx152.ger.corp.intel.com ([163.33.192.66]) by fmsmga002.fm.intel.com with ESMTP; 23 Jan 2018 04:16:18 -0800 Received: from irsmsx101.ger.corp.intel.com ([169.254.1.46]) by IRSMSX152.ger.corp.intel.com ([169.254.6.87]) with mapi id 14.03.0319.002; Tue, 23 Jan 2018 12:16:18 +0000 From: "Trahe, Fiona" To: Yong Wang , "Xing, Beilei" , "Lu, Wenzhuo" CC: "dev@dpdk.org" , "Trahe, Fiona" Thread-Topic: [PATCH v3 3/3] crypto/qat: add null point check and fix mem leak Thread-Index: AQHTk/eRQ1b6vsxihU+zJzfnSSpNrKOBXuGQ Date: Tue, 23 Jan 2018 12:16:17 +0000 References: <1516675500-10878-1-git-send-email-wang.yong19@zte.com.cn> <1516675500-10878-3-git-send-email-wang.yong19@zte.com.cn> In-Reply-To: <1516675500-10878-3-git-send-email-wang.yong19@zte.com.cn> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODE0ZmU1MjktOTEyNi00NGY0LWE0MTUtNzFkMjM3NGFkOTU2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IitYb3o1cUVoSVl6MFpCeDRNdVBjaEp1SnNSQ0dIOVhNQVU3dHJNV0JZaGM9In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MAIL: mse01.zte.com.cn w0Q3GAPv074050 Subject: Re: [dpdk-dev] [PATCH v3 3/3] crypto/qat: hebing add null point check and fix mem leak X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2018 03:16:24 -0000 Hi Yong, > -----Original Message----- > From: Yong Wang [mailto:wang.yong19@zte.com.cn] > Sent: Tuesday, January 23, 2018 2:45 AM > To: Xing, Beilei ; Lu, Wenzhuo ; Trahe, Fiona > > Cc: dev@dpdk.org; Yong Wang > Subject: [PATCH v8 3/3] crypto/qat: add null point check and fix mem leak >=20 > 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(). >=20 > Signed-off-by: Yong Wang > --- > 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(-) >=20 > 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_au= th_algo hash_alg, >=20 > in =3D rte_zmalloc("working mem for key", > ICP_QAT_HW_AES_XCBC_MAC_STATE2_SZ, 16); > + if (in =3D=3D 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 =3D 0; x < HASH_XCBC_PRECOMP_KEY_NUM; x++) { > @@ -389,6 +394,11 @@ static int qat_alg_do_precomputes(enum icp_qat_hw_au= th_algo hash_alg, > ICP_QAT_HW_GALOIS_E_CTR0_SZ); > in =3D rte_zmalloc("working mem for key", > ICP_QAT_HW_GALOIS_H_SZ, 16); > + if (in =3D=3D 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) !=3D 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 *de= v, uint16_t > queue_pair_id, > qp->op_cookies =3D rte_zmalloc("qat PMD op cookie pointer", > qp_conf->nb_descriptors * sizeof(*qp->op_cookies), > RTE_CACHE_LINE_SIZE); > + if (qp->op_cookies =3D=3D NULL) { > + PMD_DRV_LOG(ERR, "Failed to alloc mem for cookie"); > + rte_free(qp); > + return -ENOMEM; > + } >=20 > qp->mmap_bar_addr =3D pci_dev->mem_resource[0].addr; > qp->inflights16 =3D 0; > @@ -192,7 +197,7 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev= , uint16_t queue_pair_id, > for (i =3D 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; > } >=20 > struct qat_crypto_op_cookie *sql_cookie =3D > @@ -217,6 +222,7 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev= , uint16_t queue_pair_id, > return 0; >=20 > 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_mempoo= l_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