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 v3 2/3] vhost: fix fd leak in dirty logging setup Date: Mon, 9 Nov 2020 13:16:29 +0100 Message-ID: <20201109121630.251603-3-maxime.coquelin@redhat.com> (raw) In-Reply-To: <20201109121630.251603-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..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
next prev parent reply other threads:[~2020-11-09 12:17 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-09 12:16 [dpdk-dev] [PATCH v3 0/3] vhost: fix fd an memory leaks Maxime Coquelin 2020-11-09 12:16 ` [dpdk-dev] [PATCH v3 1/3] vhost: fix error path when setting memory tables Maxime Coquelin 2020-11-11 6:06 ` Xueming(Steven) Li 2020-11-12 17:00 ` Maxime Coquelin 2020-11-09 12:16 ` Maxime Coquelin [this message] 2020-11-10 1:44 ` [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup Xia, Chenbo 2020-11-11 6:13 ` Xueming(Steven) Li 2020-11-09 12:16 ` [dpdk-dev] [PATCH v3 3/3] vhost: fix fd leak in kick setup Maxime Coquelin 2020-11-11 6:01 ` 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=20201109121630.251603-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 \ /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
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git