All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wei Huang <wei.huang@intel.com>
To: dev@dpdk.org, thomas@monjalon.net, nipun.gupta@nxp.com,
	hemant.agrawal@nxp.com
Cc: stable@dpdk.org, rosen.xu@intel.com, tianfei.zhang@intel.com,
	qi.z.zhang@intel.com, Wei Huang <wei.huang@intel.com>
Subject: [PATCH v1] raw/ifpga: free file handle before function return
Date: Thu,  9 Jun 2022 04:50:09 -0400	[thread overview]
Message-ID: <1654764609-8057-1-git-send-email-wei.huang@intel.com> (raw)

Coverity issue: 379064
Fixes: 673c897f4d73 ("raw/ifpga: support OFS card probing")

Signed-off-by: Wei Huang <wei.huang@intel.com>
---
 drivers/raw/ifpga/base/ifpga_enumerate.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/drivers/raw/ifpga/base/ifpga_enumerate.c b/drivers/raw/ifpga/base/ifpga_enumerate.c
index 7a5d264..61eb660 100644
--- a/drivers/raw/ifpga/base/ifpga_enumerate.c
+++ b/drivers/raw/ifpga/base/ifpga_enumerate.c
@@ -837,8 +837,10 @@ static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info)
 		vndr_hdr = 0;
 		ret = pread(fd, &vndr_hdr, sizeof(vndr_hdr),
 			voff + PCI_VNDR_HEADER);
-		if (ret < 0)
-			return -EIO;
+		if (ret < 0) {
+			ret = -EIO;
+			goto free_handle;
+		}
 		if (PCI_VNDR_HEADER_ID(vndr_hdr) == PCI_VSEC_ID_INTEL_DFLS &&
 			pci_data->vendor_id == PCI_VENDOR_ID_INTEL)
 			break;
@@ -846,19 +848,23 @@ static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info)
 
 	if (!voff) {
 		dev_debug(hw, "%s no DFL VSEC found\n", __func__);
-		return -ENODEV;
+		ret = -ENODEV;
+		goto free_handle;
 	}
 
 	dfl_cnt = 0;
 	ret = pread(fd, &dfl_cnt, sizeof(dfl_cnt), voff + PCI_VNDR_DFLS_CNT);
-	if (ret < 0)
-		return -EIO;
+	if (ret < 0) {
+		ret = -EIO;
+		goto free_handle;
+	}
 
 	dfl_res_off = voff + PCI_VNDR_DFLS_RES;
 	if (dfl_res_off + (dfl_cnt * sizeof(u32)) > PCI_CFG_SPACE_EXP_SIZE) {
 		dev_err(hw, "%s DFL VSEC too big for PCIe config space\n",
 			__func__);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto free_handle;
 	}
 
 	for (i = 0; i < dfl_cnt; i++, dfl_res_off += sizeof(u32)) {
@@ -868,7 +874,8 @@ static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info)
 		if (bir >= PCI_MAX_RESOURCE) {
 			dev_err(hw, "%s bad bir number %d\n",
 				__func__, bir);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto free_handle;
 		}
 
 		len = pci_data->region[bir].len;
@@ -876,7 +883,8 @@ static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info)
 		if (offset >= len) {
 			dev_err(hw, "%s bad offset %u >= %"PRIu64"\n",
 				__func__, offset, len);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto free_handle;
 		}
 
 		dev_debug(hw, "%s BAR %d offset 0x%x\n", __func__, bir, offset);
@@ -886,7 +894,9 @@ static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info)
 		dfl_fpga_enum_info_add_dfl(info, start, len, addr);
 	}
 
-	return 0;
+free_handle:
+	close(fd);
+	return ret;
 }
 
 /* default method of finding dfls starting at offset 0 of bar 0 */
-- 
1.8.3.1


             reply	other threads:[~2022-06-09  8:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-09  8:50 Wei Huang [this message]
2022-06-13  6:40 ` [PATCH v1] raw/ifpga: free file handle before function return Zhang, Tianfei
2022-06-20 15:10   ` Thomas Monjalon
2022-06-15  7:18 ` Xu, Rosen

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=1654764609-8057-1-git-send-email-wei.huang@intel.com \
    --to=wei.huang@intel.com \
    --cc=dev@dpdk.org \
    --cc=hemant.agrawal@nxp.com \
    --cc=nipun.gupta@nxp.com \
    --cc=qi.z.zhang@intel.com \
    --cc=rosen.xu@intel.com \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    --cc=tianfei.zhang@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.