From: "Xueming(Steven) Li" <xuemingl@nvidia.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"xuan.ding@intel.com" <xuan.ding@intel.com>,
"stephen@networkplumber.org" <stephen@networkplumber.org>,
"NBU-Contact-Thomas Monjalon" <thomas@monjalon.net>,
"stable@dpdk.org" <stable@dpdk.org>,
"chenbo.xia@intel.com" <chenbo.xia@intel.com>
Cc: "Xueming(Steven) Li" <xuemingl@nvidia.com>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup
Date: Wed, 11 Nov 2020 06:13:59 +0000 [thread overview]
Message-ID: <BY5PR12MB4324C0074461A7D977240473A1E80@BY5PR12MB4324.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20201109121630.251603-3-maxime.coquelin@redhat.com>
>-----Original Message-----
>From: dev <dev-bounces@dpdk.org> On Behalf Of Maxime Coquelin
>Sent: Monday, November 9, 2020 8:16 PM
>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
>Cc: Maxime Coquelin <maxime.coquelin@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@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..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@nvidia.com>
next prev parent reply other threads:[~2020-11-11 6:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 12:16 [dpdk-stable] [PATCH v3 0/3] vhost: fix fd an memory leaks Maxime Coquelin
2020-11-09 12:16 ` [dpdk-stable] [PATCH v3 1/3] vhost: fix error path when setting memory tables Maxime Coquelin
2020-11-11 6:06 ` [dpdk-stable] [dpdk-dev] " Xueming(Steven) Li
2020-11-12 17:00 ` Maxime Coquelin
2020-11-09 12:16 ` [dpdk-stable] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin
2020-11-10 1:44 ` Xia, Chenbo
2020-11-11 6:13 ` Xueming(Steven) Li [this message]
2020-11-09 12:16 ` [dpdk-stable] [PATCH v3 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
2020-11-11 6:01 ` [dpdk-stable] [dpdk-dev] " Xueming(Steven) Li
2020-11-11 7:57 ` Xia, Chenbo
2020-11-12 17:06 ` 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:
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=BY5PR12MB4324C0074461A7D977240473A1E80@BY5PR12MB4324.namprd12.prod.outlook.com \
--to=xuemingl@nvidia.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--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).