[dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup

[Xueming(Steven) Li]

>-----Original Message-----
>From: dev <dev-bounces at dpdk.org> On Behalf Of Maxime Coquelin
>Sent: Monday, November 9, 2020 8:16 PM
>To: dev at dpdk.org; xuan.ding at intel.com; stephen at networkplumber.org;
>NBU-Contact-Thomas Monjalon <thomas at monjalon.net>; stable at dpdk.org;
>chenbo.xia at intel.com
>Cc: Maxime Coquelin <maxime.coquelin at redhat.com>
>Subject: [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup
>
>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 at dpdk.org
>
>Reported-by: Xuan Ding <xuan.ding at intel.com>
>Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.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
>473fd778ca..94b066f0b9 100644
>--- a/lib/librte_vhost/vhost_user.c
>+++ b/lib/librte_vhost/vhost_user.c
>@@ -2083,7 +2083,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;
>@@ -2094,7 +2094,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,
>@@ -2131,6 +2131,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

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