DPDK patches and discussions
 help / color / mirror / Atom feed
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: andy.pei@intel.com, rosen.xu@intel.com,
	marko.kovacevic@intel.com, liq3ea@163.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH] raw/ifpga: fix fd leak in rte fpga do pr
Date: Wed, 17 Apr 2019 14:49:17 +0800	[thread overview]
Message-ID: <1555483757-48188-1-git-send-email-andy.pei@intel.com> (raw)
Message-ID: <20190417064917.B6-IdfDq9X4HBJ0N_pvYfeVxLzXaq0nA-iLEcHyZYpA@z> (raw)

In rte_fpga_do_pr() function, if 'stat' returns error,
rte_fpga_do_pr() returns -EINVAL without closing the
'file_fd' that has been opened.
After this patch, 'file_fd' is closed before rte_fpga_do_pr()
returns -EINVAL when 'stat' returns error

Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver")
Cc: rosen.xu@intel.com
Cc: marko.kovacevic@intel.com
Cc: liq3ea@163.com
Cc: andy.pei@intel.com
Cc: stable@dpdk.org

Signed-off-by: Andy Pei <andy.pei@intel.com>
---
---
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index da772d0..eff001b 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -244,7 +244,8 @@
 	if (ret) {
 		IFPGA_RAWDEV_PMD_ERR("stat on bitstream file failed: %s\n",
 				file_name);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto close_fd;
 	}
 	buffer_size = file_stat.st_size;
 	IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size);
-- 
1.8.3.1


             reply	other threads:[~2019-04-17  6:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-17  6:49 Andy Pei [this message]
2019-04-17  6:49 ` Andy Pei
2019-04-17  7:14 ` Xu, Rosen
2019-04-17  7:14   ` Xu, Rosen
2019-04-17  7:17   ` Pei, Andy
2019-04-17  7:17     ` Pei, Andy
2019-04-17  7:16 ` [dpdk-dev] [PATCH v2] raw/ifpga_rawdev: " Andy Pei
2019-04-17  7:16   ` Andy Pei
2019-04-17  8:03   ` Xu, Rosen
2019-04-17  8:03     ` Xu, Rosen
2019-04-22 17:52     ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2019-04-22 17:52       ` Thomas Monjalon
2019-04-23  1:19       ` Pei, Andy
2019-04-23  1:19         ` Pei, Andy
2019-04-23  1:36         ` Xu, Rosen
2019-04-23  1:36           ` Xu, Rosen
2019-04-23  8:45           ` Thomas Monjalon
2019-04-23  8:45             ` Thomas Monjalon
2019-04-24  1:13             ` Pei, Andy
2019-04-24  1:13               ` Pei, Andy

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=1555483757-48188-1-git-send-email-andy.pei@intel.com \
    --to=andy.pei@intel.com \
    --cc=dev@dpdk.org \
    --cc=liq3ea@163.com \
    --cc=marko.kovacevic@intel.com \
    --cc=rosen.xu@intel.com \
    --cc=stable@dpdk.org \
    /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).