From: hanxueluo@126.com
To: dev@dpdk.org
Cc: Huanle Han <hanxueluo@gmail.com>
Subject: [dpdk-dev] [PATCH 2/3] net/virtio: fix crash when close virtio dev twice
Date: Mon, 20 Feb 2017 22:04:46 +0800 [thread overview]
Message-ID: <1487599487-12574-2-git-send-email-hanxueluo@126.com> (raw)
In-Reply-To: <1487599487-12574-1-git-send-email-hanxueluo@126.com>
From: Huanle Han <hanxueluo@gmail.com>
This commit fixs segment fault when rte_eth_dev_close()
is called on a virtio dev more than once.
Assigning zero after free to avoids freed memory to
be accessed again.
Signed-off-by: Huanle Han <hanxueluo@gmail.com>
---
drivers/net/virtio/virtio_ethdev.c | 5 +++++
lib/librte_ether/rte_ethdev.c | 2 ++
2 files changed, 7 insertions(+)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 8465e1a..b9565db 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -545,6 +545,9 @@ virtio_free_queues(struct virtio_hw *hw)
int queue_type;
uint16_t i;
+ if (hw->vqs == NULL)
+ return;
+
for (i = 0; i < nr_vq; i++) {
vq = hw->vqs[i];
if (!vq)
@@ -563,9 +566,11 @@ virtio_free_queues(struct virtio_hw *hw)
}
rte_free(vq);
+ hw->vqs[i] = NULL;
}
rte_free(hw->vqs);
+ hw->vqs = NULL;
}
static int
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index eb0a94a..24f82dc 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1074,8 +1074,10 @@ rte_eth_dev_close(uint8_t port_id)
dev->data->dev_started = 0;
(*dev->dev_ops->dev_close)(dev);
+ dev->data->nb_rx_queues = 0;
rte_free(dev->data->rx_queues);
dev->data->rx_queues = NULL;
+ dev->data->nb_tx_queues = 0;
rte_free(dev->data->tx_queues);
dev->data->tx_queues = NULL;
}
--
2.7.4
next prev parent reply other threads:[~2017-02-20 14:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-20 14:04 [dpdk-dev] [PATCH 1/3] net/virtio: fix dev detachable flag hanxueluo
2017-02-20 14:04 ` hanxueluo [this message]
2017-02-22 2:24 ` [dpdk-dev] [PATCH 2/3] net/virtio: fix crash when close virtio dev twice Yuanhan Liu
2017-04-28 4:56 ` Yuanhan Liu
2017-02-20 14:04 ` [dpdk-dev] [PATCH 3/3] pci: fix crash caused by invaild memory write hanxueluo
2017-02-22 2:36 ` Yuanhan Liu
2017-05-01 22:59 ` Thomas Monjalon
2017-02-22 2:34 ` [dpdk-dev] [PATCH 1/3] net/virtio: fix dev detachable flag Yuanhan Liu
2017-04-28 4:58 ` Yuanhan 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=1487599487-12574-2-git-send-email-hanxueluo@126.com \
--to=hanxueluo@126.com \
--cc=dev@dpdk.org \
--cc=hanxueluo@gmail.com \
/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).