From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>,
"dev@dpdk.org" <dev@dpdk.org>, "Ding, Xuan" <xuan.ding@intel.com>,
"stephen@networkplumber.org" <stephen@networkplumber.org>,
"Yigit, Ferruh" <ferruh.yigit@intel.com>,
"thomas@monjalon.net" <thomas@monjalon.net>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH 2/3] vhost: fix fd leak in dirty logging setup
Date: Fri, 6 Nov 2020 02:53:06 +0000 [thread overview]
Message-ID: <MN2PR11MB4063550C0B9BF9910C2D92FF9CED0@MN2PR11MB4063.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20201105114549.97717-3-maxime.coquelin@redhat.com>
Hi Maxime,
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Thursday, November 5, 2020 7:46 PM
> To: dev@dpdk.org; Ding, Xuan <xuan.ding@intel.com>;
> stephen@networkplumber.org; Yigit, Ferruh <ferruh.yigit@intel.com>;
> thomas@monjalon.net; Xia, Chenbo <chenbo.xia@intel.com>
> Cc: stable@dpdk.org; Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH 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@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 | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 473fd778ca..7dfda15991 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -2076,14 +2076,14 @@ 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);
> - return RTE_VHOST_MSG_RESULT_ERR;
> + goto close_msg_fds;
IMHO, there's nothing to close in this case. Before this check, validate_msg_fds
makes sure that this msg has only one fd and now this fd is invalid. So when this
error occurs, going to close_msg_fds always does nothing. So I think we don't need
this change here?
Thanks!
Chenbo
> }
>
> if (msg->size != sizeof(VhostUserLog)) {
> 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
next prev parent reply other threads:[~2020-11-06 2:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 11:45 [dpdk-stable] [PATCH 0/3] vhost: fix fd an memory leaks Maxime Coquelin
2020-11-05 11:45 ` [dpdk-stable] [PATCH 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
2020-11-06 2:53 ` Xia, Chenbo
2020-11-06 8:13 ` Maxime Coquelin
2020-11-05 11:45 ` [dpdk-stable] [PATCH 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
2020-11-06 2:53 ` Xia, Chenbo [this message]
2020-11-06 8:07 ` Maxime Coquelin
2020-11-05 11:45 ` [dpdk-stable] [PATCH 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
2020-11-06 2:53 ` Xia, Chenbo
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=MN2PR11MB4063550C0B9BF9910C2D92FF9CED0@MN2PR11MB4063.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=maxime.coquelin@redhat.com \
--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).