From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id ECB0F4CAB for ; Wed, 10 Apr 2019 12:23:47 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2019 03:23:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,332,1549958400"; d="scan'208";a="133037962" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga008.jf.intel.com with ESMTP; 10 Apr 2019 03:23:46 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 03:23:46 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 03:23:46 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.153]) with mapi id 14.03.0415.000; Wed, 10 Apr 2019 18:23:44 +0800 From: "Xu, Rosen" To: Li Qiang , "Zhang, Tianfei" CC: "dev@dpdk.org" , "liq3ea@gmail.com" Thread-Topic: [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr Thread-Index: AQHU7uEWl3FwEU9hK0irGZgMQQ+GfqY1MOHg Date: Wed, 10 Apr 2019 10:23:44 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A695C24@SHSMSX104.ccr.corp.intel.com> References: <20190409143221.16396-1-liq3ea@163.com> In-Reply-To: <20190409143221.16396-1-liq3ea@163.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDMyNTc3ZWMtMmFlZS00NWVlLTg4ZGYtMmFhYTg1Zjk4YjY1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaUo5eGxuaU4weHBpZERRaGFiNW5vUnpOcnREOHpPbGI5UXRCT1JEWkprSGM4OEZBclE4U2pFNWt1aEhUejFpXC8ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 10:23:48 -0000 > -----Original Message----- > From: Li Qiang [mailto:liq3ea@163.com] > Sent: Tuesday, April 09, 2019 22:32 > To: Xu, Rosen ; Zhang, Tianfei > > Cc: dev@dpdk.org; liq3ea@gmail.com; Li Qiang > Subject: [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr >=20 > In rte_fpga_do_pr() function, if 'stat' return error the 'file_fd' is nev= er closed > thus leading a fd leak. This patch avoids this. >=20 > Spotted by Coverity: CID 27441 >=20 > Signed-off-by: Li Qiang > --- > drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > index da772d026..0dbb16ca6 100644 > --- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > +++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > @@ -244,7 +244,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int > port_id, > if (ret) { > IFPGA_RAWDEV_PMD_ERR("stat on bitstream file > failed: %s\n", > file_name); > - return -EINVAL; Fill ret before goto close_fd. > + goto close_fd; > } > buffer_size =3D file_stat.st_size; > IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size); > -- > 2.17.1 >=20 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 6FAF1A0096 for ; Wed, 10 Apr 2019 12:23:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F8E84F94; Wed, 10 Apr 2019 12:23:49 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id ECB0F4CAB for ; Wed, 10 Apr 2019 12:23:47 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2019 03:23:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,332,1549958400"; d="scan'208";a="133037962" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga008.jf.intel.com with ESMTP; 10 Apr 2019 03:23:46 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 03:23:46 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 03:23:46 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.153]) with mapi id 14.03.0415.000; Wed, 10 Apr 2019 18:23:44 +0800 From: "Xu, Rosen" To: Li Qiang , "Zhang, Tianfei" CC: "dev@dpdk.org" , "liq3ea@gmail.com" Thread-Topic: [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr Thread-Index: AQHU7uEWl3FwEU9hK0irGZgMQQ+GfqY1MOHg Date: Wed, 10 Apr 2019 10:23:44 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A695C24@SHSMSX104.ccr.corp.intel.com> References: <20190409143221.16396-1-liq3ea@163.com> In-Reply-To: <20190409143221.16396-1-liq3ea@163.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDMyNTc3ZWMtMmFlZS00NWVlLTg4ZGYtMmFhYTg1Zjk4YjY1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaUo5eGxuaU4weHBpZERRaGFiNW5vUnpOcnREOHpPbGI5UXRCT1JEWkprSGM4OEZBclE4U2pFNWt1aEhUejFpXC8ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Message-ID: <20190410102344.D4XtBDG76O6ikARqzX6SZ5G0VUCJeKodvHIhUHmZU3Q@z> > -----Original Message----- > From: Li Qiang [mailto:liq3ea@163.com] > Sent: Tuesday, April 09, 2019 22:32 > To: Xu, Rosen ; Zhang, Tianfei > > Cc: dev@dpdk.org; liq3ea@gmail.com; Li Qiang > Subject: [PATCH] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr >=20 > In rte_fpga_do_pr() function, if 'stat' return error the 'file_fd' is nev= er closed > thus leading a fd leak. This patch avoids this. >=20 > Spotted by Coverity: CID 27441 >=20 > Signed-off-by: Li Qiang > --- > drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > index da772d026..0dbb16ca6 100644 > --- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > +++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > @@ -244,7 +244,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int > port_id, > if (ret) { > IFPGA_RAWDEV_PMD_ERR("stat on bitstream file > failed: %s\n", > file_name); > - return -EINVAL; Fill ret before goto close_fd. > + goto close_fd; > } > buffer_size =3D file_stat.st_size; > IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size); > -- > 2.17.1 >=20