From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3F5EA04DB; Thu, 15 Oct 2020 14:50:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C106B1E55F; Thu, 15 Oct 2020 14:50:41 +0200 (CEST) Received: from huawei.com (szxga02-in.huawei.com [45.249.212.188]) by dpdk.org (Postfix) with ESMTP id 60ACB1C1AA; Thu, 15 Oct 2020 14:50:39 +0200 (CEST) Received: from DGGEMM402-HUB.china.huawei.com (unknown [172.30.72.55]) by Forcepoint Email with ESMTP id B04D0E9A4738F7430C5F; Thu, 15 Oct 2020 20:50:37 +0800 (CST) Received: from DGGEMM533-MBX.china.huawei.com ([169.254.5.63]) by DGGEMM402-HUB.china.huawei.com ([10.3.20.210]) with mapi id 14.03.0487.000; Thu, 15 Oct 2020 20:50:31 +0800 From: wangyunjian To: "Chautru, Nicolas" , "dev@dpdk.org" CC: "Lilijun (Jerry)" , xudingke , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] baseband/turbo_sw: fix memory leak in error path Thread-Index: AQHWnIjEISCW7sRqokuXsp/BY2/of6mMSKIAgAxhRSA= Date: Thu, 15 Oct 2020 12:50:31 +0000 Message-ID: <34EFBCA9F01B0748BEB6B629CE643AE60DAAE45D@DGGEMM533-MBX.china.huawei.com> References: <1cad32e57c8081477a0f448b5b3d61711ef6b382.1602060933.git.wangyunjian@huawei.com> In-Reply-To: Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.174.187.156] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: Re: [dpdk-dev] [PATCH] baseband/turbo_sw: fix memory leak in error path 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Chautru, Nicolas [mailto:nicolas.chautru@intel.com] > Sent: Thursday, October 8, 2020 7:45 AM > To: wangyunjian ; dev@dpdk.org > Cc: Lilijun (Jerry) ; xudingke > ; stable@dpdk.org > Subject: RE: [dpdk-dev] [PATCH] baseband/turbo_sw: fix memory leak in err= or > path >=20 > Hi wangyunjian, >=20 > > -----Original Message----- > > From: wangyunjian > > Sent: Wednesday, October 7, 2020 2:04 AM > > To: dev@dpdk.org > > Cc: Chautru, Nicolas ; > > jerry.lilijun@huawei.com; xudingke@huawei.com; Yunjian Wang > > ; stable@dpdk.org > > Subject: [dpdk-dev] [PATCH] baseband/turbo_sw: fix memory leak in > > error path > > > > From: Yunjian Wang > > > > In q_setup() allocated memory for the queue data, we should free it > > when error happens, otherwise it will lead to memory leak. > > > > Fixes: b8cfe2c9aed2 ("bb/turbo_sw: add software turbo driver") > > Cc: stable@dpdk.org > > > > Signed-off-by: Yunjian Wang > > --- > > drivers/baseband/turbo_sw/bbdev_turbo_software.c | 16 > > ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c > > b/drivers/baseband/turbo_sw/bbdev_turbo_software.c > > index a36099e91..e55b32927 100644 > > --- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c > > +++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c > > @@ -302,7 +302,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; >=20 > It may be better to move the freeing into a common function and return th= e > relevant failure ENUM for each failure reason. > With the proposed changed it would always return EFAULT to application. >=20 > For information did you ever catch that exception from actually running t= he > code or purely from code review? I struggle to see that error genuinely > happening. By code review. I will fix return code in the next version. Thanks, Yunjian >=20 > Thanks, > Nic >=20 > > } > > q->enc_out =3D rte_zmalloc_socket(name, > > ((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) * @@ > > -322,7 +322,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->enc_in =3D rte_zmalloc_socket(name, > > (RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q- > > >enc_in), @@ -340,7 +340,7 @@ q_setup(struct rte_bbdev *dev, uint16_t > > q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->ag =3D rte_zmalloc_socket(name, > > RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q- > > >ag), @@ -358,7 +358,7 @@ q_setup(struct rte_bbdev *dev, uint16_t > > >q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->code_block =3D rte_zmalloc_socket(name, > > RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q- > > >code_block), @@ -377,7 +377,7 @@ q_setup(struct rte_bbdev *dev, > > uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->deint_input =3D rte_zmalloc_socket(name, > > DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input), @@ -396,7 > +396,7 > > @@ q_setup(struct rte_bbdev *dev, uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->deint_output =3D rte_zmalloc_socket(NULL, > > DEINT_OUTPUT_BUF_SIZE * sizeof(*q- > > >deint_output), @@ -415,7 +415,7 @@ q_setup(struct rte_bbdev *dev, > > uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->adapter_output =3D rte_zmalloc_socket(NULL, > > ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q- > > >adapter_output), @@ -433,7 +433,7 @@ q_setup(struct rte_bbdev *dev, > > uint16_t q_id, > > rte_bbdev_log(ERR, > > "Creating queue name for device %u queue %u failed", > > dev->data->dev_id, q_id); > > - return -ENAMETOOLONG; > > + goto free_q; > > } > > q->processed_pkts =3D rte_ring_create(name, queue_conf- > > >queue_size, > > queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ); > > -- > > 2.23.0