patches for DPDK stable branches
 help / color / Atom feed
From: "Chautru, Nicolas" <nicolas.chautru@intel.com>
To: wangyunjian <wangyunjian@huawei.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "jerry.lilijun@huawei.com" <jerry.lilijun@huawei.com>,
	"xudingke@huawei.com" <xudingke@huawei.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v2] baseband/turbo_sw: fix memory leak in error path
Date: Sat, 17 Oct 2020 00:22:58 +0000
Message-ID: <BY5PR11MB44515DC1B41707947180328BF8000@BY5PR11MB4451.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1602769545-29456-1-git-send-email-wangyunjian@huawei.com>

Thanks
Reviewed-by: Nicolas Chautru <nicolas.chautru@intel.com>

> -----Original Message-----
> From: wangyunjian <wangyunjian@huawei.com>
> Sent: Thursday, October 15, 2020 6:46 AM
> To: dev@dpdk.org
> Cc: Chautru, Nicolas <nicolas.chautru@intel.com>; jerry.lilijun@huawei.com;
> xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] baseband/turbo_sw: fix memory leak in error
> path
> 
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> 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 <wangyunjian@huawei.com>
> ---
> v2:
>    fix code styles Chautru Nicolas
> ---
>  .../baseband/turbo_sw/bbdev_turbo_software.c  | 35 ++++++++++++++-----
>  1 file changed, 26 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> index a36099e91..aa7f12238 100644
> --- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> +++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> @@ -10,6 +10,7 @@
>  #include <rte_ring.h>
>  #include <rte_kvargs.h>
>  #include <rte_cycles.h>
> +#include <rte_errno.h>
> 
>  #include <rte_bbdev.h>
>  #include <rte_bbdev_pmd.h>
> @@ -302,7 +303,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->enc_out = rte_zmalloc_socket(name,
>  			((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) * @@
> -311,6 +313,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
>  	if (q->enc_out == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -322,7 +325,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->enc_in = rte_zmalloc_socket(name,
>  			(RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q-
> >enc_in), @@ -330,6 +334,7 @@ q_setup(struct rte_bbdev *dev, uint16_t
> q_id,
>  	if (q->enc_in == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -340,7 +345,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->ag = rte_zmalloc_socket(name,
>  			RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q-
> >ag), @@ -348,6 +354,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
>  	if (q->ag == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -358,7 +365,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->code_block = rte_zmalloc_socket(name,
>  			RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q-
> >code_block), @@ -366,6 +374,7 @@ q_setup(struct rte_bbdev *dev,
> uint16_t q_id,
>  	if (q->code_block == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -377,7 +386,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->deint_input = rte_zmalloc_socket(name,
>  			DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input),
> @@ -385,6 +395,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
>  	if (q->deint_input == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -396,7 +407,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->deint_output = rte_zmalloc_socket(NULL,
>  			DEINT_OUTPUT_BUF_SIZE * sizeof(*q-
> >deint_output), @@ -404,6 +416,7 @@ q_setup(struct rte_bbdev *dev,
> uint16_t q_id,
>  	if (q->deint_output == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -415,7 +428,8 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->adapter_output = rte_zmalloc_socket(NULL,
>  			ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q-
> >adapter_output), @@ -423,6 +437,7 @@ q_setup(struct rte_bbdev *dev,
> uint16_t q_id,
>  	if (q->adapter_output == NULL) {
>  		rte_bbdev_log(ERR,
>  			"Failed to allocate queue memory for %s", name);
> +		ret = -ENOMEM;
>  		goto free_q;
>  	}
> 
> @@ -433,12 +448,14 @@ 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;
> +		ret = -ENAMETOOLONG;
> +		goto free_q;
>  	}
>  	q->processed_pkts = rte_ring_create(name, queue_conf-
> >queue_size,
>  			queue_conf->socket, RING_F_SP_ENQ |
> RING_F_SC_DEQ);
>  	if (q->processed_pkts == NULL) {
>  		rte_bbdev_log(ERR, "Failed to create ring for %s", name);
> +		ret = -rte_errno;
>  		goto free_q;
>  	}
> 
> @@ -458,7 +475,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
>  	rte_free(q->deint_output);
>  	rte_free(q->adapter_output);
>  	rte_free(q);
> -	return -EFAULT;
> +	return ret;
>  }
> 
>  static const struct rte_bbdev_ops pmd_ops = {
> --
> 2.23.0

Reviewed-By


  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-07  9:03 [dpdk-stable] [dpdk-dev] [PATCH] " wangyunjian
2020-10-07 23:45 ` Chautru, Nicolas
2020-10-15 12:50   ` wangyunjian
2020-10-15 13:45 ` [dpdk-stable] [dpdk-dev] [PATCH v2] " wangyunjian
2020-10-17  0:22   ` Chautru, Nicolas [this message]
2020-10-28 11:29   ` Akhil Goyal

Reply instructions:

You may reply publically 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=BY5PR11MB44515DC1B41707947180328BF8000@BY5PR11MB4451.namprd11.prod.outlook.com \
    --to=nicolas.chautru@intel.com \
    --cc=dev@dpdk.org \
    --cc=jerry.lilijun@huawei.com \
    --cc=stable@dpdk.org \
    --cc=wangyunjian@huawei.com \
    --cc=xudingke@huawei.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

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox