[dpdk-stable] [PATCH] net/virtio: fix memory leak

[dpdk-stable] [PATCH] net/virtio: fix memory leak

[Pengzhen Liu]

In function eth_virtio_dev_init(), dynamic memory stored
in "eth_dev->data->mac_addrs" variable and it is not freed
when function return,
this is a possible memory leak.

Fixes: 8ced1542f7a3 ("net/virtio: eth_dev->data->mac_addrs is not freed")
Cc: stable@dpdk.org
Signed-off-by: Pengzhen Liu <liupengzhen3@huawei.com>
---
 drivers/net/virtio/virtio_ethdev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index a8ae788..59a76ad 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1588,13 +1588,13 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev,
 	if (!hw->virtio_user_dev) {
 		ret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
 		if (ret)
-			return ret;
+			goto out;
 	}
 
 	/* reset device and negotiate default features */
 	ret = virtio_init_device(eth_dev, VIRTIO_PMD_DEFAULT_GUEST_FEATURES);
 	if (ret < 0)
-		return ret;
+		goto out;
 
 	/* Setup interrupt callback  */
 	if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
@@ -1602,6 +1602,10 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev,
 			virtio_interrupt_handler, eth_dev);
 
 	return 0;
+
+out:
+	rte_free(eth_dev->data->mac_addrs);
+	return ret;
 }
 
 static int
-- 
1.7.12.4

Re: [dpdk-stable] [PATCH] net/virtio: fix memory leak

[Yuanhan Liu]

On Fri, Oct 27, 2017 at 11:54:09AM +0800, Pengzhen Liu wrote:
> In function eth_virtio_dev_init(), dynamic memory stored
> in "eth_dev->data->mac_addrs" variable and it is not freed
> when function return,
> this is a possible memory leak.
> 
> Fixes: 8ced1542f7a3 ("net/virtio: eth_dev->data->mac_addrs is not freed")
> Cc: stable@dpdk.org
> Signed-off-by: Pengzhen Liu <liupengzhen3@huawei.com>

Acked-by: Yuanhan Liu <yliu@fridaylinux.org>

	--yliu

Re: [dpdk-stable] [PATCH] net/virtio: fix memory leak

[Yuanhan Liu]

On Wed, Nov 01, 2017 at 11:33:51PM +0800, Yuanhan Liu wrote:
> On Fri, Oct 27, 2017 at 11:54:09AM +0800, Pengzhen Liu wrote:
> > In function eth_virtio_dev_init(), dynamic memory stored
> > in "eth_dev->data->mac_addrs" variable and it is not freed
> > when function return,
> > this is a possible memory leak.
> > 
> > Fixes: 8ced1542f7a3 ("net/virtio: eth_dev->data->mac_addrs is not freed")
> > Cc: stable@dpdk.org
> > Signed-off-by: Pengzhen Liu <liupengzhen3@huawei.com>
> 
> Acked-by: Yuanhan Liu <yliu@fridaylinux.org>

BTW, I have just seen you have send multiple versions out regarding this
patch. Next time please tag your patches with version, something like:

    $ git format-patch -v 2 ...
	
	--yliu

Re: [dpdk-stable] [dpdk-dev] [PATCH] net/virtio: fix memory leak

[Thomas Monjalon]

01/11/2017 16:33, Yuanhan Liu:
> On Fri, Oct 27, 2017 at 11:54:09AM +0800, Pengzhen Liu wrote:
> > In function eth_virtio_dev_init(), dynamic memory stored
> > in "eth_dev->data->mac_addrs" variable and it is not freed
> > when function return,
> > this is a possible memory leak.
> > 
> > Fixes: 8ced1542f7a3 ("net/virtio: eth_dev->data->mac_addrs is not freed")
> > Cc: stable@dpdk.org
> > Signed-off-by: Pengzhen Liu <liupengzhen3@huawei.com>
> 
> Acked-by: Yuanhan Liu <yliu@fridaylinux.org>

Applied, thanks

Re: [dpdk-stable] [dpdk-dev] [PATCH] net/virtio: fix memory leak

[Maxime Coquelin]

Hi Pengzhen,

On 10/26/2017 10:52 AM, Pengzhen Liu wrote:
> In function eth_virtio_dev_init(), dynamic memory stored
> in "eth_dev->data->mac_addrs" variable and it is not freed when function return,
> this is a possible memory leak.
> 
> Fixes: 6b9ed026a870 ("net/virtio: eth_dev->data->mac_addrs is not freed")
> Cc: stable@dpdk.org
> Signed-off-by: Pengzhen Liu <liupengzhen3@huawei.com>
> ---
>   drivers/net/virtio/virtio_ethdev.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
> index c85c14d..c450f25 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -1587,13 +1587,13 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev,
>   	if (!hw->virtio_user_dev) {
>   		ret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
>   		if (ret)
> -            goto out;
> +			goto out;
I think you missed to squash your patch with the initial one, as tis one
only fixes indentation.

Could you resend a squashed version, and tag it as v2?

Thanks,
Maxime


>   	}
>   
>   	/* reset device and negotiate default features */
>   	ret = virtio_init_device(eth_dev, VIRTIO_PMD_DEFAULT_GUEST_FEATURES);
>   	if (ret < 0)
> -        goto out;
> +		goto out;
>   
>   	/* Setup interrupt callback  */
>   	if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
> @@ -1603,8 +1603,8 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev,
>   	return 0;
>   
>   out:
> -    rte_free(eth_dev->data->mac_addrs);
> -    return ret;
> +	rte_free(eth_dev->data->mac_addrs);
> +	return ret;
>   }
>   
>   static int
>