Skip to contentSkip to conversation

raw/ifpga: free file handle before function return

PATCH Applied Wei Huang 4 participants 4 messages Jun 9, 2022 – Jun 20, 2022

lore
Share & tools
lore

Wei Huang

author
#0 lore raw

PATCH 1/1 raw/ifpga: free file handle before function return

Coverity issue: 379064

Fixes 673c897f4d73 ("raw/ifpga: support OFS card probing")
---
 drivers/raw/ifpga/base/ifpga_enumerate.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/raw/ifpga/base/ifpga_enumerate.c +19 -9
index 7a5d264..61eb660 100644
@@ -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 */
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 92 lines

-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Thursday, June 9, 2022 4:50 PM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v1] raw/ifpga: free file handle before function return

Coverity issue: 379064

Fixes 673c897f4d73 ("raw/ifpga: support OFS card probing")
---
 drivers/raw/ifpga/base/ifpga_enumerate.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/raw/ifpga/base/ifpga_enumerate.c +4 -2
index 7a5d264..61eb660 100644
@@ -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 &&

drivers/raw/ifpga/base/ifpga_enumerate.c +8 -4
 			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)

drivers/raw/ifpga/base/ifpga_enumerate.c +4 -2
 		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)

drivers/raw/ifpga/base/ifpga_enumerate.c static int find_dfls_by_vsec(struct dfl_fpga_enum_info *info) · line 902

Quoted 10 lines
drivers/raw/ifpga/base/ifpga_enumerate.c +3 -1
 		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 */

It looks good for me.

Reviewed-by on v1 1/1
#3 lore raw
In reply to Wei Huang

Hi Wei,

Quoted 104 lines

-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Thursday, June 09, 2022 16:50
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v1] raw/ifpga: free file handle before function return

Coverity issue: 379064

Fixes 673c897f4d73 ("raw/ifpga: support OFS card probing")
---
 drivers/raw/ifpga/base/ifpga_enumerate.c | 28 +++++++++++++++++++----
-----
 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/raw/ifpga/base/ifpga_enumerate.c +4 -2
index 7a5d264..61eb660 100644
@@ -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 &&

drivers/raw/ifpga/base/ifpga_enumerate.c +8 -4
 			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;
drivers/raw/ifpga/base/ifpga_enumerate.c +5 -2
 	}
 
 	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)

drivers/raw/ifpga/base/ifpga_enumerate.c +3 -2
 		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 */
--
Quoted 1 line

1.8.3.1

It looks good for me.