DPDK patches and discussions
 help / color / mirror / Atom feed
From: Pengzhen Liu <liupengzhen3@huawei.com>
To: <thomas@monjalon.net>
Cc: <dev@dpdk.org>, <liupengzhen3@huawei.com>, <stable@dpdk.org>
Subject: [dpdk-dev] [PATCH] net/virtio: fix memory leak
Date: Thu, 26 Oct 2017 22:42:21 +0800	[thread overview]
Message-ID: <1509028941-7364-1-git-send-email-liupengzhen3@huawei.com> (raw)

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: 289ba0c0f52a ("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 ff2d9d6..4c7c3c4 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)
-			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)
@@ -1601,6 +1601,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

             reply	other threads:[~2017-10-26 14:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-26 14:42 Pengzhen Liu [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-10-27  3:54 Pengzhen Liu
2017-10-26  9:04 Pengzhen Liu
2017-10-26  8:52 Pengzhen Liu
2017-10-26  8:30 ` Maxime Coquelin
2017-10-26  7:32 Pengzhen Liu

Reply instructions:

You may reply publicly 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=1509028941-7364-1-git-send-email-liupengzhen3@huawei.com \
    --to=liupengzhen3@huawei.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).