patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/virtio: fix memory leak
@ 2017-10-27  3:54 Pengzhen Liu
  2017-11-01 15:33 ` Yuanhan Liu
  0 siblings, 1 reply; 5+ messages in thread
From: Pengzhen Liu @ 2017-10-27  3:54 UTC (permalink / raw)
  To: thomas; +Cc: dev, liupengzhen3, stable

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH] net/virtio: fix memory leak
@ 2017-10-26  8:52 Pengzhen Liu
  2017-10-26  8:30 ` [dpdk-stable] [dpdk-dev] " Maxime Coquelin
  0 siblings, 1 reply; 5+ messages in thread
From: Pengzhen Liu @ 2017-10-26  8:52 UTC (permalink / raw)
  To: thomas
  Cc: dev, liupengzhen3, zhangsha.zhang, huangjian.huangjian,
	zangchuanqiang, stable

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;
 	}
 
 	/* 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
-- 
1.7.12.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-11-12 18:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-27  3:54 [dpdk-stable] [PATCH] net/virtio: fix memory leak Pengzhen Liu
2017-11-01 15:33 ` Yuanhan Liu
2017-11-01 15:49   ` Yuanhan Liu
2017-11-12 18:53   ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
  -- strict thread matches above, loose matches on Subject: below --
2017-10-26  8:52 [dpdk-stable] " Pengzhen Liu
2017-10-26  8:30 ` [dpdk-stable] [dpdk-dev] " Maxime Coquelin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).