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, xuemingl@nvidia.com Cc: Maxime Coquelin <maxime.coquelin@redhat.com> Subject: [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Date: Thu, 12 Nov 2020 18:10:29 +0100 Message-ID: <20201112171029.354593-4-maxime.coquelin@redhat.com> (raw) In-Reply-To: <20201112171029.354593-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 23c115f994..45c8ac09da 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1858,8 +1858,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
next prev parent reply other threads:[~2020-11-12 17:11 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-12 17:10 [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks Maxime Coquelin 2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 1/3] vhost: fix error path when setting memory tables Maxime Coquelin 2020-11-13 7:39 ` Xueming(Steven) Li 2020-11-12 17:10 ` [dpdk-stable] [PATCH v4 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin 2020-11-12 17:10 ` Maxime Coquelin [this message] 2020-11-13 7:41 ` [dpdk-stable] [PATCH v4 3/3] vhost: fix fd leak in kick setup Xueming(Steven) Li 2020-11-13 8:39 ` [dpdk-stable] [PATCH v4 0/3] vhost: fix fd an memory leaks 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=20201112171029.354593-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 \ --cc=xuemingl@nvidia.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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/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 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git