DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, xuan.ding@intel.com, stephen@networkplumber.org,
	thomas@monjalon.net, stable@dpdk.org, chenbo.xia@intel.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup
Date: Mon,  9 Nov 2020 12:25:59 +0100	[thread overview]
Message-ID: <20201109112600.250779-3-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20201109112600.250779-1-maxime.coquelin@redhat.com>

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>
 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..e4ad5f6baf 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2076,7 +2076,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	if (fd < 0) {
 		VHOST_LOG_CONFIG(ERR, "invalid log fd: %d\n", fd);
+		goto close_msg_fds;
 	if (msg->size != sizeof(VhostUserLog)) {
@@ -2094,7 +2094,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			"log offset %#"PRIx64" and log size %#"PRIx64" overflow\n",
 			off, size);
+		goto close_msg_fds;
@@ -2131,6 +2131,10 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	msg->fd_num = 0;
+	close_msg_fds(msg);
 static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused,

  parent reply	other threads:[~2020-11-09 11:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 11:25 [dpdk-dev] [PATCH v2 0/3] vhost: fix fd an memory leaks Maxime Coquelin
2020-11-09 11:25 ` [dpdk-dev] [PATCH v2 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
2020-11-09 11:25 ` Maxime Coquelin [this message]
2020-11-09 12:07   ` [dpdk-dev] [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup Xia, Chenbo
2020-11-09 12:11     ` Maxime Coquelin
2020-11-09 11:26 ` [dpdk-dev] [PATCH v2 3/3] vhost: fix fd leak in kick setup Maxime Coquelin

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201109112600.250779-3-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=chenbo.xia@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=stephen@networkplumber.org \
    --cc=thomas@monjalon.net \
    --cc=xuan.ding@intel.com \


* 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).