[dpdk-stable] [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails

[Wang, Xiao W]

Hi,

Thanks for the patch.

> -----Original Message-----
> From: wangyunjian <wangyunjian at huawei.com>
> Sent: Wednesday, October 7, 2020 3:37 PM
> To: dev at dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang at intel.com>; Wang, Xiao W
> <xiao.w.wang at intel.com>; jerry.lilijun at huawei.com;
> xudingke at huawei.com; Yunjian Wang <wangyunjian at huawei.com>;
> stable at dpdk.org
> Subject: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh
> check fails
> 
> From: Yunjian Wang <wangyunjian at huawei.com>
> 
> In fm10k_tx_queue_setup(), we allocate memory for the queue
> structure but not released when Tx thresh check fails.
> 
> Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
> ---
>  drivers/net/fm10k/fm10k_ethdev.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index 309637071..c4a6fdf7f 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -2024,8 +2024,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev,
> uint16_t queue_id,
>  	q->ops = &def_txq_ops;
>  	q->tail_ptr = (volatile uint32_t *)
>  		&((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];
> -	if (handle_txconf(q, conf))
> +	if (handle_txconf(q, conf)) {
> +		rte_free(q);
>  		return -EINVAL;
> +	}
> 
>  	/* allocate memory for the software ring */
>  	q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
> --
> 2.23.0

Acked-by: Xiao Wang <xiao.w.wang at intel.com>