* [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost
@ 2019-01-15 7:13 Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 1/2] vhost: fix memory leak on realloc failure Tiwei Bie
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tiwei Bie @ 2019-01-15 7:13 UTC (permalink / raw)
To: maxime.coquelin, zhihong.wang, thomas, dev
Tiwei Bie (2):
vhost: fix memory leak on realloc failure
examples/vhost: fix path allocation failure handling
examples/vhost/main.c | 8 ++++++++
lib/librte_vhost/vhost_user.c | 3 +++
2 files changed, 11 insertions(+)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] [PATCH v2 1/2] vhost: fix memory leak on realloc failure
2019-01-15 7:13 [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Tiwei Bie
@ 2019-01-15 7:13 ` Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 2/2] examples/vhost: fix path allocation failure handling Tiwei Bie
2019-01-17 11:31 ` [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: Tiwei Bie @ 2019-01-15 7:13 UTC (permalink / raw)
To: maxime.coquelin, zhihong.wang, thomas, dev; +Cc: stable
When realloc() fails, the original block isn't freed.
Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
Cc: stable@dpdk.org
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost_user.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 1843e032f..4a968ef70 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -733,13 +733,16 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
uint64_t host_phys_addr, uint64_t size)
{
struct guest_page *page, *last_page;
+ struct guest_page *old_pages;
if (dev->nr_guest_pages == dev->max_guest_pages) {
dev->max_guest_pages *= 2;
+ old_pages = dev->guest_pages;
dev->guest_pages = realloc(dev->guest_pages,
dev->max_guest_pages * sizeof(*page));
if (!dev->guest_pages) {
RTE_LOG(ERR, VHOST_CONFIG, "cannot realloc guest_pages\n");
+ free(old_pages);
return -1;
}
}
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] [PATCH v2 2/2] examples/vhost: fix path allocation failure handling
2019-01-15 7:13 [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 1/2] vhost: fix memory leak on realloc failure Tiwei Bie
@ 2019-01-15 7:13 ` Tiwei Bie
2019-01-17 11:31 ` [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: Tiwei Bie @ 2019-01-15 7:13 UTC (permalink / raw)
To: maxime.coquelin, zhihong.wang, thomas, dev; +Cc: stable
Add the missing failure handling for path allocation,
as realloc() may fail.
Fixes: ad0eef4d2203 ("examples/vhost: support multiple socket files")
Cc: stable@dpdk.org
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
v2:
- Improve the title and add some explanations (Thomas);
examples/vhost/main.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 645cf51e9..5e914f58e 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -353,11 +353,19 @@ port_init(uint16_t port)
static int
us_vhost_parse_socket_path(const char *q_arg)
{
+ char *old;
+
/* parse number string */
if (strnlen(q_arg, PATH_MAX) == PATH_MAX)
return -1;
+ old = socket_files;
socket_files = realloc(socket_files, PATH_MAX * (nb_sockets + 1));
+ if (socket_files == NULL) {
+ free(old);
+ return -1;
+ }
+
snprintf(socket_files + nb_sockets * PATH_MAX, PATH_MAX, "%s", q_arg);
nb_sockets++;
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost
2019-01-15 7:13 [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 1/2] vhost: fix memory leak on realloc failure Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 2/2] examples/vhost: fix path allocation failure handling Tiwei Bie
@ 2019-01-17 11:31 ` Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2019-01-17 11:31 UTC (permalink / raw)
To: Tiwei Bie, zhihong.wang, thomas, dev
On 1/15/19 8:13 AM, Tiwei Bie wrote:
> Tiwei Bie (2):
> vhost: fix memory leak on realloc failure
> examples/vhost: fix path allocation failure handling
>
> examples/vhost/main.c | 8 ++++++++
> lib/librte_vhost/vhost_user.c | 3 +++
> 2 files changed, 11 insertions(+)
>
Applied to dpdk-next-virtio/master.
Thanks,
Maxime
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-17 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-15 7:13 [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 1/2] vhost: fix memory leak on realloc failure Tiwei Bie
2019-01-15 7:13 ` [dpdk-dev] [PATCH v2 2/2] examples/vhost: fix path allocation failure handling Tiwei Bie
2019-01-17 11:31 ` [dpdk-dev] [PATCH v2 0/2] Fixes for realloc() in vhost 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).