From: wangyunjian <wangyunjian@huawei.com>
To: <dev@dpdk.org>, <grive@u256.net>
Cc: <jerry.lilijun@huawei.com>, <xudingke@huawei.com>,
Yunjian Wang <wangyunjian@huawei.com>, <stable@dpdk.org>
Subject: [dpdk-dev] [PATCH] net/failsafe: fix fd leak
Date: Mon, 27 Apr 2020 18:44:19 +0800 [thread overview]
Message-ID: <1587984259-18296-1-git-send-email-wangyunjian@huawei.com> (raw)
From: Yunjian Wang <wangyunjian@huawei.com>
Zero is a valid fd. The fd won't be closed thus leading fd leak,
when it is zero.
Fixes: f234e5bd996d ("net/failsafe: register slaves Rx interrupts")
Fixes: 9e0360aebf23 ("net/failsafe: register as Rx interrupt mode")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/failsafe/failsafe_intr.c | 2 +-
drivers/net/failsafe/failsafe_ops.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c
index d8728fe7e..602c04033 100644
--- a/drivers/net/failsafe/failsafe_intr.c
+++ b/drivers/net/failsafe/failsafe_intr.c
@@ -393,7 +393,7 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv)
free(priv->rxp.evec);
priv->rxp.evec = NULL;
}
- if (priv->rxp.efd > 0) {
+ if (priv->rxp.efd >= 0) {
close(priv->rxp.efd);
priv->rxp.efd = -1;
}
diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 50f2aca4e..e1d08e46c 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -380,7 +380,7 @@ fs_rx_queue_release(void *queue)
rxq = queue;
dev = &rte_eth_devices[rxq->priv->data->port_id];
fs_lock(dev, 0);
- if (rxq->event_fd > 0)
+ if (rxq->event_fd >= 0)
close(rxq->event_fd);
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
if (ETH(sdev)->data->rx_queues != NULL &&
--
2.19.1
next reply other threads:[~2020-04-27 10:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 10:44 wangyunjian [this message]
2020-04-27 11:12 ` Gaëtan Rivet
2020-04-27 16:55 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2020-05-03 11:33 ` Ali Alnubani
2020-05-04 16:22 ` Gaëtan Rivet
2020-05-04 16:28 ` Stephen Hemminger
2020-05-05 9:47 ` Ali Alnubani
2020-05-05 9:14 ` Ali Alnubani
2020-05-05 18:35 ` Gaëtan Rivet
2020-05-05 19:10 ` [dpdk-dev] [PATCH v1 0/3] failsafe & ring fixes Gaetan Rivet
2020-05-05 19:10 ` [dpdk-dev] [PATCH v1 1/3] net/failsafe: avoid crash on malformed eth_dev Gaetan Rivet
2020-05-06 17:16 ` Ferruh Yigit
2020-05-05 19:10 ` [dpdk-dev] [PATCH v1 2/3] net/ring: fix eth_dev device pointer on allocation Gaetan Rivet
2020-05-06 11:48 ` Ferruh Yigit
2020-05-06 12:33 ` Gaëtan Rivet
2020-05-06 13:43 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2020-05-06 17:32 ` Gaëtan Rivet
2020-05-06 18:09 ` [dpdk-dev] [PATCH v2] " Gaetan Rivet
2020-05-08 11:00 ` Ferruh Yigit
2020-05-11 16:54 ` Ferruh Yigit
2020-05-05 19:10 ` [dpdk-dev] [PATCH v1 3/3] net/failsafe: fix default service proxy state Gaetan Rivet
2020-05-06 8:58 ` Ali Alnubani
2020-05-06 17:16 ` Ferruh Yigit
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=1587984259-18296-1-git-send-email-wangyunjian@huawei.com \
--to=wangyunjian@huawei.com \
--cc=dev@dpdk.org \
--cc=grive@u256.net \
--cc=jerry.lilijun@huawei.com \
--cc=stable@dpdk.org \
--cc=xudingke@huawei.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).