[dpdk-stable] [PATCH] net/dpaa: fix potential memory leak
Yuanhan Liu
yliu at fridaylinux.org
Thu Feb 8 15:21:01 CET 2018
On Thu, Feb 08, 2018 at 06:17:24AM -0500, Yong Wang wrote:
> [ backported from upstream commit 0ff76833f8b54d61c2795d1710fb60aa499469bf ]
>
> There are several func calls to rte_zmalloc() which don't do null
> pointer check on the return value. And before return, the memory is not
> freed. Fix it by adding null pointer check and rte_free().
>
> Fixes: 37f9b54bd3cf ("net/dpaa: support Tx and Rx queue setup")
> Fixes: 62f53995caaf ("net/dpaa: add frame count based tail drop with CGR")
> Cc: stable at dpdk.org
>
> Signed-off-by: Yong Wang <wang.yong19 at zte.com.cn>
> Reviewed-by: Shreyansh Jain <shreyansh.jain at nxp.com>
Applied to dpdk-stable/17.11.
Thanks!
--yliu
> ---
> drivers/net/dpaa/dpaa_ethdev.c | 36 +++++++++++++++++++++++++-----------
> 1 file changed, 25 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
> index 29678c5..e4375c3 100644
> --- a/drivers/net/dpaa/dpaa_ethdev.c
> +++ b/drivers/net/dpaa/dpaa_ethdev.c
> @@ -873,12 +873,17 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
>
> dpaa_intf->rx_queues = rte_zmalloc(NULL,
> sizeof(struct qman_fq) * num_rx_fqs, MAX_CACHELINE);
> + if (!dpaa_intf->rx_queues) {
> + DPAA_PMD_ERR("Failed to alloc mem for RX queues\n");
> + return -ENOMEM;
> + }
> +
> for (loop = 0; loop < num_rx_fqs; loop++) {
> fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid *
> DPAA_PCD_FQID_MULTIPLIER + loop;
> ret = dpaa_rx_queue_init(&dpaa_intf->rx_queues[loop], fqid);
> if (ret)
> - return ret;
> + goto free_rx;
> dpaa_intf->rx_queues[loop].dpaa_intf = dpaa_intf;
> }
> dpaa_intf->nb_rx_queues = num_rx_fqs;
> @@ -887,14 +892,17 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
> num_cores = rte_lcore_count();
> dpaa_intf->tx_queues = rte_zmalloc(NULL, sizeof(struct qman_fq) *
> num_cores, MAX_CACHELINE);
> - if (!dpaa_intf->tx_queues)
> - return -ENOMEM;
> + if (!dpaa_intf->tx_queues) {
> + DPAA_PMD_ERR("Failed to alloc mem for TX queues\n");
> + ret = -ENOMEM;
> + goto free_rx;
> + }
>
> for (loop = 0; loop < num_cores; loop++) {
> ret = dpaa_tx_queue_init(&dpaa_intf->tx_queues[loop],
> fman_intf);
> if (ret)
> - return ret;
> + goto free_tx;
> dpaa_intf->tx_queues[loop].dpaa_intf = dpaa_intf;
> }
> dpaa_intf->nb_tx_queues = num_cores;
> @@ -931,13 +939,8 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
> DPAA_PMD_ERR("Failed to allocate %d bytes needed to "
> "store MAC addresses",
> ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER);
> - rte_free(dpaa_intf->rx_queues);
> - rte_free(dpaa_intf->tx_queues);
> - dpaa_intf->rx_queues = NULL;
> - dpaa_intf->tx_queues = NULL;
> - dpaa_intf->nb_rx_queues = 0;
> - dpaa_intf->nb_tx_queues = 0;
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto free_tx;
> }
>
> /* copy the primary mac address */
> @@ -963,6 +966,17 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
> fman_if_stats_reset(fman_intf);
>
> return 0;
> +
> +free_tx:
> + rte_free(dpaa_intf->tx_queues);
> + dpaa_intf->tx_queues = NULL;
> + dpaa_intf->nb_tx_queues = 0;
> +
> +free_rx:
> + rte_free(dpaa_intf->rx_queues);
> + dpaa_intf->rx_queues = NULL;
> + dpaa_intf->nb_rx_queues = 0;
> + return ret;
> }
>
> static int
> --
> 1.8.3.1
More information about the stable
mailing list