From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id E5DC6A0096 for ; Wed, 8 May 2019 18:02:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AEFE2DE3; Wed, 8 May 2019 18:02:42 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6130ADE3 for ; Wed, 8 May 2019 18:02:39 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD4AE81E0F; Wed, 8 May 2019 16:02:38 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF6CC60C82; Wed, 8 May 2019 16:02:37 +0000 (UTC) From: Kevin Traynor To: Li Qiang Cc: Rosen Xu , dpdk stable Date: Wed, 8 May 2019 17:01:59 +0100 Message-Id: <20190508160233.2648-2-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 08 May 2019 16:02:38 +0000 (UTC) Subject: [dpdk-stable] patch 'raw/ifpga: fix file descriptor leak in error path' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Rosen Xu --- 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@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,