patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks
@ 2020-11-12 17:10 Maxime Coquelin
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Maxime Coquelin @ 2020-11-12 17:10 UTC (permalink / raw)
  To: dev, xuan.ding, stephen, thomas, stable, chenbo.xia, xuemingl
  Cc: Maxime Coquelin

This series fixes several leaks in Vhost-user requests
handling.

Thanks to Xuan Ding from Intel for reporting these
issues.

Changes in v4:
- Fix wrong return value in set_mem_table (Xueming)

Changes in v3:
- Remove the right closing of fds. (Chenbo)
Changes in v2:
- Fix typos in commit messages. (Chenbo)
- Remove useless closing of fds in set_log_base. (Chenbo)

Maxime Coquelin (3):
  vhost: fix error path when setting memory tables
  vhost: fix fd leak in dirty logging setup
  vhost: fix fd leak in kick setup

 lib/librte_vhost/vhost_user.c | 74 +++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 25 deletions(-)

-- 
2.26.2


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

* [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables
  2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
@ 2020-11-12 17:10 ` Maxime Coquelin
  2020-11-13  7:39   ` Xueming(Steven) Li
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Maxime Coquelin @ 2020-11-12 17:10 UTC (permalink / raw)
  To: dev, xuan.ding, stephen, thomas, stable, chenbo.xia, xuemingl
  Cc: Maxime Coquelin

If an error is encountered before the memory regions are
parsed, the file descriptors for these shared buffers are
leaked.

This patch fixes this by closing the message file descriptors
on error, taking care of avoiding double closing of the file
descriptors. guest_pages is also freed, even though it was not
leaked as its pointer was not overridden on subsequent function
calls.

Fixes: 8f972312b8f4 ("vhost: support vhost-user")
Cc: stable@dpdk.org

Reported-by: Xuan Ding <xuan.ding@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
 lib/librte_vhost/vhost_user.c | 60 ++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 8a8726f8b8..3898c93d1f 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -99,8 +99,15 @@ close_msg_fds(struct VhostUserMsg *msg)
 {
 	int i;
 
-	for (i = 0; i < msg->fd_num; i++)
-		close(msg->fds[i]);
+	for (i = 0; i < msg->fd_num; i++) {
+		int fd = msg->fds[i];
+
+		if (fd == -1)
+			continue;
+
+		msg->fds[i] = -1;
+		close(fd);
+	}
 }
 
 /*
@@ -1004,7 +1011,6 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	uint64_t alignment;
 	uint32_t i;
 	int populate;
-	int fd;
 
 	if (validate_msg_fds(msg, memory->nregions) != 0)
 		return RTE_VHOST_MSG_RESULT_ERR;
@@ -1012,7 +1018,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	if (memory->nregions > VHOST_MEMORY_MAX_NREGIONS) {
 		VHOST_LOG_CONFIG(ERR,
 			"too many memory regions (%u)\n", memory->nregions);
-		return RTE_VHOST_MSG_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
 	if (dev->mem && !vhost_memory_changed(memory, dev->mem)) {
@@ -1054,7 +1060,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				"(%d) failed to allocate memory "
 				"for dev->guest_pages\n",
 				dev->vid);
-			return RTE_VHOST_MSG_RESULT_ERR;
+			goto close_msg_fds;
 		}
 	}
 
@@ -1064,18 +1070,23 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		VHOST_LOG_CONFIG(ERR,
 			"(%d) failed to allocate memory for dev->mem\n",
 			dev->vid);
-		return RTE_VHOST_MSG_RESULT_ERR;
+		goto free_guest_pages;
 	}
 	dev->mem->nregions = memory->nregions;
 
 	for (i = 0; i < memory->nregions; i++) {
-		fd  = msg->fds[i];
 		reg = &dev->mem->regions[i];
 
 		reg->guest_phys_addr = memory->regions[i].guest_phys_addr;
 		reg->guest_user_addr = memory->regions[i].userspace_addr;
 		reg->size            = memory->regions[i].memory_size;
-		reg->fd              = fd;
+		reg->fd              = msg->fds[i];
+
+		/*
+		 * Assign invalid file descriptor value to avoid double
+		 * closing on error path.
+		 */
+		msg->fds[i] = -1;
 
 		mmap_offset = memory->regions[i].mmap_offset;
 
@@ -1085,7 +1096,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				"mmap_offset (%#"PRIx64") and memory_size "
 				"(%#"PRIx64") overflow\n",
 				mmap_offset, reg->size);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		mmap_size = reg->size + mmap_offset;
@@ -1098,11 +1109,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		 * to avoid failure, make sure in caller to keep length
 		 * aligned.
 		 */
-		alignment = get_blk_size(fd);
+		alignment = get_blk_size(reg->fd);
 		if (alignment == (uint64_t)-1) {
 			VHOST_LOG_CONFIG(ERR,
 				"couldn't get hugepage size through fstat\n");
-			goto err_mmap;
+			goto free_mem_table;
 		}
 		mmap_size = RTE_ALIGN_CEIL(mmap_size, alignment);
 		if (mmap_size == 0) {
@@ -1118,17 +1129,17 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			VHOST_LOG_CONFIG(ERR, "mmap size (0x%" PRIx64 ") "
 					"or alignment (0x%" PRIx64 ") is invalid\n",
 					reg->size + mmap_offset, alignment);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		populate = dev->async_copy ? MAP_POPULATE : 0;
 		mmap_addr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,
-				 MAP_SHARED | populate, fd, 0);
+				 MAP_SHARED | populate, reg->fd, 0);
 
 		if (mmap_addr == MAP_FAILED) {
 			VHOST_LOG_CONFIG(ERR,
 				"mmap region %u failed.\n", i);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		reg->mmap_addr = mmap_addr;
@@ -1141,7 +1152,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				VHOST_LOG_CONFIG(ERR,
 					"adding guest pages to region %u failed.\n",
 					i);
-				goto err_mmap;
+				goto free_mem_table;
 			}
 
 		VHOST_LOG_CONFIG(INFO,
@@ -1184,17 +1195,17 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		if (read_vhost_message(main_fd, &ack_msg) <= 0) {
 			VHOST_LOG_CONFIG(ERR,
 				"Failed to read qemu ack on postcopy set-mem-table\n");
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		if (validate_msg_fds(&ack_msg, 0) != 0)
-			goto err_mmap;
+			goto free_mem_table;
 
 		if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
 			VHOST_LOG_CONFIG(ERR,
 				"Bad qemu ack on postcopy set-mem-table (%d)\n",
 				ack_msg.request.master);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		/* Now userfault register and we can use the memory */
@@ -1218,7 +1229,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 					"Failed to register ufd for region %d: (ufd = %d) %s\n",
 					i, dev->postcopy_ufd,
 					strerror(errno));
-				goto err_mmap;
+				goto free_mem_table;
 			}
 			VHOST_LOG_CONFIG(INFO,
 				"\t userfaultfd registered for range : "
@@ -1227,7 +1238,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				(uint64_t)reg_struct.range.start +
 				(uint64_t)reg_struct.range.len - 1);
 #else
-			goto err_mmap;
+			goto free_mem_table;
 #endif
 		}
 	}
@@ -1249,7 +1260,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			dev = translate_ring_addresses(dev, i);
 			if (!dev) {
 				dev = *pdev;
-				goto err_mmap;
+				goto free_mem_table;
 			}
 
 			*pdev = dev;
@@ -1260,10 +1271,15 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
 	return RTE_VHOST_MSG_RESULT_OK;
 
-err_mmap:
+free_mem_table:
 	free_mem_region(dev);
 	rte_free(dev->mem);
 	dev->mem = NULL;
+free_guest_pages:
+	rte_free(dev->guest_pages);
+	dev->guest_pages = NULL;
+close_msg_fds:
+	close_msg_fds(msg);
 	return RTE_VHOST_MSG_RESULT_ERR;
 }
 
-- 
2.26.2


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

* [dpdk-stable] [PATCH v4 2/3] vhost: fix fd leak in dirty logging setup
  2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
@ 2020-11-12 17:10 ` Maxime Coquelin
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
  2020-11-13  8:39 ` [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
  3 siblings, 0 replies; 7+ messages in thread
From: Maxime Coquelin @ 2020-11-12 17:10 UTC (permalink / raw)
  To: dev, xuan.ding, stephen, thomas, stable, chenbo.xia, xuemingl
  Cc: Maxime Coquelin

This patch fixes a file descriptor leak which happens
in the error path of vhost_user_set_log_base().

Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
Cc: stable@dpdk.org

Reported-by: Xuan Ding <xuan.ding@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Xueming(Steven) Li <xuemingl@nvidia.com>
---
 lib/librte_vhost/vhost_user.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 3898c93d1f..23c115f994 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2086,7 +2086,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		VHOST_LOG_CONFIG(ERR,
 			"invalid log base msg size: %"PRId32" != %d\n",
 			msg->size, (int)sizeof(VhostUserLog));
-		return RTE_VHOST_MSG_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
 	size = msg->payload.log.mmap_size;
@@ -2097,7 +2097,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		VHOST_LOG_CONFIG(ERR,
 			"log offset %#"PRIx64" and log size %#"PRIx64" overflow\n",
 			off, size);
-		return RTE_VHOST_MSG_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
 	VHOST_LOG_CONFIG(INFO,
@@ -2134,6 +2134,10 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	msg->fd_num = 0;
 
 	return RTE_VHOST_MSG_RESULT_REPLY;
+
+close_msg_fds:
+	close_msg_fds(msg);
+	return RTE_VHOST_MSG_RESULT_ERR;
 }
 
 static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused,
-- 
2.26.2


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

* [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup
  2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
@ 2020-11-12 17:10 ` Maxime Coquelin
  2020-11-13  7:41   ` Xueming(Steven) Li
  2020-11-13  8:39 ` [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
  3 siblings, 1 reply; 7+ messages in thread
From: Maxime Coquelin @ 2020-11-12 17:10 UTC (permalink / raw)
  To: dev, xuan.ding, stephen, thomas, stable, chenbo.xia, xuemingl
  Cc: Maxime Coquelin

This patch fixes a file descriptor leak which happens
in the error path of vhost_user_set_vring_kick().

Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
Cc: stable@dpdk.org

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
 lib/librte_vhost/vhost_user.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 23c115f994..45c8ac09da 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1858,8 +1858,12 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
 	/* Interpret ring addresses only when ring is started. */
 	dev = translate_ring_addresses(dev, file.index);
-	if (!dev)
+	if (!dev) {
+		if (file.fd != VIRTIO_INVALID_EVENTFD)
+			close(file.fd);
+
 		return RTE_VHOST_MSG_RESULT_ERR;
+	}
 
 	*pdev = dev;
 
-- 
2.26.2


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

* Re: [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
@ 2020-11-13  7:39   ` Xueming(Steven) Li
  0 siblings, 0 replies; 7+ messages in thread
From: Xueming(Steven) Li @ 2020-11-13  7:39 UTC (permalink / raw)
  To: Maxime Coquelin, dev, xuan.ding, stephen,
	NBU-Contact-Thomas Monjalon, stable, chenbo.xia



>-----Original Message-----
>From: Maxime Coquelin <maxime.coquelin@redhat.com>
>Sent: Friday, November 13, 2020 1:10 AM
>To: dev@dpdk.org; xuan.ding@intel.com; stephen@networkplumber.org;
>NBU-Contact-Thomas Monjalon <thomas@monjalon.net>; stable@dpdk.org;
>chenbo.xia@intel.com; Xueming(Steven) Li <xuemingl@nvidia.com>
>Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>Subject: [PATCH v4 1/3] vhost: fix error path when setting memory tables
>
>If an error is encountered before the memory regions are parsed, the file
>descriptors for these shared buffers are leaked.
>
>This patch fixes this by closing the message file descriptors on error, taking
>care of avoiding double closing of the file descriptors. guest_pages is also
>freed, even though it was not leaked as its pointer was not overridden on
>subsequent function calls.
>
>Fixes: 8f972312b8f4 ("vhost: support vhost-user")
>Cc: stable@dpdk.org
>
>Reported-by: Xuan Ding <xuan.ding@intel.com>
>Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
>---
> lib/librte_vhost/vhost_user.c | 60 ++++++++++++++++++++++-------------
> 1 file changed, 38 insertions(+), 22 deletions(-)
>
>diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index
>8a8726f8b8..3898c93d1f 100644
>--- a/lib/librte_vhost/vhost_user.c
>+++ b/lib/librte_vhost/vhost_user.c
>@@ -99,8 +99,15 @@ close_msg_fds(struct VhostUserMsg *msg)  {
> 	int i;
>
>-	for (i = 0; i < msg->fd_num; i++)
>-		close(msg->fds[i]);
>+	for (i = 0; i < msg->fd_num; i++) {
>+		int fd = msg->fds[i];
>+
>+		if (fd == -1)
>+			continue;
>+
>+		msg->fds[i] = -1;
>+		close(fd);
>+	}
> }
>
> /*
>@@ -1004,7 +1011,6 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 	uint64_t alignment;
> 	uint32_t i;
> 	int populate;
>-	int fd;
>
> 	if (validate_msg_fds(msg, memory->nregions) != 0)
> 		return RTE_VHOST_MSG_RESULT_ERR;
>@@ -1012,7 +1018,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 	if (memory->nregions > VHOST_MEMORY_MAX_NREGIONS) {
> 		VHOST_LOG_CONFIG(ERR,
> 			"too many memory regions (%u)\n", memory-
>>nregions);
>-		return RTE_VHOST_MSG_RESULT_ERR;
>+		goto close_msg_fds;
> 	}
>
> 	if (dev->mem && !vhost_memory_changed(memory, dev->mem))
>{ @@ -1054,7 +1060,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 				"(%d) failed to allocate memory "
> 				"for dev->guest_pages\n",
> 				dev->vid);
>-			return RTE_VHOST_MSG_RESULT_ERR;
>+			goto close_msg_fds;
> 		}
> 	}
>
>@@ -1064,18 +1070,23 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 		VHOST_LOG_CONFIG(ERR,
> 			"(%d) failed to allocate memory for dev->mem\n",
> 			dev->vid);
>-		return RTE_VHOST_MSG_RESULT_ERR;
>+		goto free_guest_pages;
> 	}
> 	dev->mem->nregions = memory->nregions;
>
> 	for (i = 0; i < memory->nregions; i++) {
>-		fd  = msg->fds[i];
> 		reg = &dev->mem->regions[i];
>
> 		reg->guest_phys_addr = memory->regions[i].guest_phys_addr;
> 		reg->guest_user_addr = memory->regions[i].userspace_addr;
> 		reg->size            = memory->regions[i].memory_size;
>-		reg->fd              = fd;
>+		reg->fd              = msg->fds[i];
>+
>+		/*
>+		 * Assign invalid file descriptor value to avoid double
>+		 * closing on error path.
>+		 */
>+		msg->fds[i] = -1;
>
> 		mmap_offset = memory->regions[i].mmap_offset;
>
>@@ -1085,7 +1096,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 				"mmap_offset (%#"PRIx64") and memory_size
>"
> 				"(%#"PRIx64") overflow\n",
> 				mmap_offset, reg->size);
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
>
> 		mmap_size = reg->size + mmap_offset;
>@@ -1098,11 +1109,11 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 		 * to avoid failure, make sure in caller to keep length
> 		 * aligned.
> 		 */
>-		alignment = get_blk_size(fd);
>+		alignment = get_blk_size(reg->fd);
> 		if (alignment == (uint64_t)-1) {
> 			VHOST_LOG_CONFIG(ERR,
> 				"couldn't get hugepage size through fstat\n");
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
> 		mmap_size = RTE_ALIGN_CEIL(mmap_size, alignment);
> 		if (mmap_size == 0) {
>@@ -1118,17 +1129,17 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 			VHOST_LOG_CONFIG(ERR, "mmap size (0x%" PRIx64 ")
>"
> 					"or alignment (0x%" PRIx64 ") is
>invalid\n",
> 					reg->size + mmap_offset, alignment);
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
>
> 		populate = dev->async_copy ? MAP_POPULATE : 0;
> 		mmap_addr = mmap(NULL, mmap_size, PROT_READ |
>PROT_WRITE,
>-				 MAP_SHARED | populate, fd, 0);
>+				 MAP_SHARED | populate, reg->fd, 0);
>
> 		if (mmap_addr == MAP_FAILED) {
> 			VHOST_LOG_CONFIG(ERR,
> 				"mmap region %u failed.\n", i);
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
>
> 		reg->mmap_addr = mmap_addr;
>@@ -1141,7 +1152,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 				VHOST_LOG_CONFIG(ERR,
> 					"adding guest pages to region %u
>failed.\n",
> 					i);
>-				goto err_mmap;
>+				goto free_mem_table;
> 			}
>
> 		VHOST_LOG_CONFIG(INFO,
>@@ -1184,17 +1195,17 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 		if (read_vhost_message(main_fd, &ack_msg) <= 0) {
> 			VHOST_LOG_CONFIG(ERR,
> 				"Failed to read qemu ack on postcopy set-
>mem-table\n");
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
>
> 		if (validate_msg_fds(&ack_msg, 0) != 0)
>-			goto err_mmap;
>+			goto free_mem_table;
>
> 		if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE)
>{
> 			VHOST_LOG_CONFIG(ERR,
> 				"Bad qemu ack on postcopy set-mem-table
>(%d)\n",
> 				ack_msg.request.master);
>-			goto err_mmap;
>+			goto free_mem_table;
> 		}
>
> 		/* Now userfault register and we can use the memory */ @@
>-1218,7 +1229,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev,
>struct VhostUserMsg *msg,
> 					"Failed to register ufd for region %d:
>(ufd = %d) %s\n",
> 					i, dev->postcopy_ufd,
> 					strerror(errno));
>-				goto err_mmap;
>+				goto free_mem_table;
> 			}
> 			VHOST_LOG_CONFIG(INFO,
> 				"\t userfaultfd registered for range : "
>@@ -1227,7 +1238,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 				(uint64_t)reg_struct.range.start +
> 				(uint64_t)reg_struct.range.len - 1);  #else
>-			goto err_mmap;
>+			goto free_mem_table;
> #endif
> 		}
> 	}
>@@ -1249,7 +1260,7 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
> 			dev = translate_ring_addresses(dev, i);
> 			if (!dev) {
> 				dev = *pdev;
>-				goto err_mmap;
>+				goto free_mem_table;
> 			}
>
> 			*pdev = dev;
>@@ -1260,10 +1271,15 @@ vhost_user_set_mem_table(struct virtio_net
>**pdev, struct VhostUserMsg *msg,
>
> 	return RTE_VHOST_MSG_RESULT_OK;
>
>-err_mmap:
>+free_mem_table:
> 	free_mem_region(dev);
> 	rte_free(dev->mem);
> 	dev->mem = NULL;
>+free_guest_pages:
>+	rte_free(dev->guest_pages);
>+	dev->guest_pages = NULL;
>+close_msg_fds:
>+	close_msg_fds(msg);
> 	return RTE_VHOST_MSG_RESULT_ERR;
> }
>
>--
>2.26.2

Reviewed-by: Xueming(Steven) Li <xuemingl@nvidia.com>

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

* Re: [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
@ 2020-11-13  7:41   ` Xueming(Steven) Li
  0 siblings, 0 replies; 7+ messages in thread
From: Xueming(Steven) Li @ 2020-11-13  7:41 UTC (permalink / raw)
  To: Maxime Coquelin, dev, xuan.ding, stephen,
	NBU-Contact-Thomas Monjalon, stable, chenbo.xia



>-----Original Message-----
>From: Maxime Coquelin <maxime.coquelin@redhat.com>
>Sent: Friday, November 13, 2020 1:10 AM
>To: dev@dpdk.org; xuan.ding@intel.com; stephen@networkplumber.org;
>NBU-Contact-Thomas Monjalon <thomas@monjalon.net>; stable@dpdk.org;
>chenbo.xia@intel.com; Xueming(Steven) Li <xuemingl@nvidia.com>
>Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>Subject: [PATCH v4 3/3] vhost: fix fd leak in kick setup
>
>This patch fixes a file descriptor leak which happens in the error path of
>vhost_user_set_vring_kick().
>
>Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")
>Cc: stable@dpdk.org
>
>Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
>---
> lib/librte_vhost/vhost_user.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index
>23c115f994..45c8ac09da 100644
>--- a/lib/librte_vhost/vhost_user.c
>+++ b/lib/librte_vhost/vhost_user.c
>@@ -1858,8 +1858,12 @@ vhost_user_set_vring_kick(struct virtio_net **pdev,
>struct VhostUserMsg *msg,
>
> 	/* Interpret ring addresses only when ring is started. */
> 	dev = translate_ring_addresses(dev, file.index);
>-	if (!dev)
>+	if (!dev) {
>+		if (file.fd != VIRTIO_INVALID_EVENTFD)
>+			close(file.fd);
>+
> 		return RTE_VHOST_MSG_RESULT_ERR;
>+	}
>
> 	*pdev = dev;
>
>--
>2.26.2
Reviewed-by: Xueming(Steven) Li <xuemingl@nvidia.com>

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

* Re: [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks
  2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
                   ` (2 preceding siblings ...)
  2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
@ 2020-11-13  8:39 ` Maxime Coquelin
  3 siblings, 0 replies; 7+ messages in thread
From: Maxime Coquelin @ 2020-11-13  8:39 UTC (permalink / raw)
  To: dev, xuan.ding, stephen, thomas, stable, chenbo.xia, xuemingl



On 11/12/20 6:10 PM, Maxime Coquelin wrote:
> This series fixes several leaks in Vhost-user requests
> handling.
> 
> Thanks to Xuan Ding from Intel for reporting these
> issues.
> 
> Changes in v4:
> - Fix wrong return value in set_mem_table (Xueming)
> 
> Changes in v3:
> - Remove the right closing of fds. (Chenbo)
> Changes in v2:
> - Fix typos in commit messages. (Chenbo)
> - Remove useless closing of fds in set_log_base. (Chenbo)
> 
> Maxime Coquelin (3):
>   vhost: fix error path when setting memory tables
>   vhost: fix fd leak in dirty logging setup
>   vhost: fix fd leak in kick setup
> 
>  lib/librte_vhost/vhost_user.c | 74 +++++++++++++++++++++++------------
>  1 file changed, 49 insertions(+), 25 deletions(-)
> 

Applied to dpdk-next-virtio/main.

Thanks,
Maxime


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

end of thread, other threads:[~2020-11-13  8:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin
2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
2020-11-13  7:39   ` Xueming(Steven) Li
2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
2020-11-13  7:41   ` Xueming(Steven) Li
2020-11-13  8:39 ` [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git