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 3/3] vhost: fix fd leak in kick setup
Date: Mon, 9 Nov 2020 12:26:00 +0100 [thread overview]
Message-ID: <20201109112600.250779-4-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_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 e4ad5f6baf..e8478f2551 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1855,8 +1855,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
prev parent reply other threads:[~2020-11-09 11:27 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 ` [dpdk-dev] [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
2020-11-09 12:07 ` Xia, Chenbo
2020-11-09 12:11 ` Maxime Coquelin
2020-11-09 11:26 ` Maxime Coquelin [this message]
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=20201109112600.250779-4-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 \
/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).