[dpdk-stable] patch 'raw/ifpga: fix file descriptor leak in error path' has been queued to LTS release 18.11.2
Kevin Traynor
ktraynor at redhat.com
Wed May 8 18:01:59 CEST 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1f78ae57332f0e11eaa154f9f6fc8026d483992d
Thanks.
Kevin Traynor
---
>From 1f78ae57332f0e11eaa154f9f6fc8026d483992d Mon Sep 17 00:00:00 2001
From: Li Qiang <liq3ea at 163.com>
Date: Tue, 16 Apr 2019 13:05:14 +0800
Subject: [PATCH] raw/ifpga: fix file descriptor leak in error path
[ upstream commit 194a83d837472a27030e55af95b1103c90c2c63a ]
In rte_fpga_do_pr() function, if 'stat' return error the
'file_fd' is never closed thus leading a fd leak.
This patch avoids this.
Coverity issue: 279441
Fixes: ef1e8ede3da59e ("raw/ifpga: add Intel FPGA bus rawdev driver")
Signed-off-by: Li Qiang <liq3ea at 163.com>
Acked-by: Rosen Xu <rosen.xu at 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 da772d026..eff001b59 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -245,5 +245,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
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;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.535308833 +0100
+++ 0002-raw-ifpga-fix-file-descriptor-leak-in-error-path.patch 2019-05-08 16:33:57.269582707 +0100
@@ -1 +1 @@
-From 194a83d837472a27030e55af95b1103c90c2c63a Mon Sep 17 00:00:00 2001
+From 1f78ae57332f0e11eaa154f9f6fc8026d483992d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 194a83d837472a27030e55af95b1103c90c2c63a ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 33b2511de..41be1a205 100644
+index da772d026..eff001b59 100644
@@ -24 +25 @@
-@@ -293,5 +293,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
+@@ -245,5 +245,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
More information about the stable
mailing list