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 ED3611B46C; Tue, 16 Apr 2019 09:02:46 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2019 00:02:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,355,1549958400"; d="scan'208";a="165122157" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga001.fm.intel.com with ESMTP; 16 Apr 2019 00:02:45 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 16 Apr 2019 00:02:35 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.42]) with mapi id 14.03.0415.000; Tue, 16 Apr 2019 15:02:24 +0800 From: "Xu, Rosen" To: Li Qiang , "Zhang, Tianfei" CC: "dev@dpdk.org" , "stable@dpdk.org" , "liq3ea@gmail.com" Thread-Topic: [PATCH v3] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr Thread-Index: AQHU9BIcw1kGGXK8GU+hCPUOw0HSiqY+XGBg Date: Tue, 16 Apr 2019 07:02:24 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A6B02B5@SHSMSX104.ccr.corp.intel.com> References: <20190416050514.2784-1-liq3ea@163.com> In-Reply-To: <20190416050514.2784-1-liq3ea@163.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzYwOWIyYzUtYzA2NS00NzZjLWIzMjQtZDcxOWQzZWVjZmQ5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoid1pUNFZsS1pYdENoSVY1MllyMHQySFc4bW5Za1h3SkxPOVRVOGR6MitxQjloSUdUVlN2aENONmZxSTZrSCtQWCJ9 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 v3] 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: Tue, 16 Apr 2019 07:02:47 -0000 > -----Original Message----- > From: Li Qiang [mailto:liq3ea@163.com] > Sent: Tuesday, April 16, 2019 13:05 > To: Xu, Rosen ; Zhang, Tianfei > > Cc: dev@dpdk.org; stable@dpdk.org; liq3ea@gmail.com; Li Qiang > > Subject: [PATCH v3] 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 > Coverity issue: 279441 > Fixes: ef1e8ede3da59e("raw/ifpga: add Intel FPGA bus rawdev driver") > Cc: stable@dpdk.org >=20 > Signed-off-by: Li Qiang > --- > Change since v2: add proper tags in commit message >=20 > drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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 > @@ -244,7 +244,8 @@ 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; > + ret =3D -EINVAL; > + goto close_fd; > } > buffer_size =3D file_stat.st_size; > IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size); > -- > 2.19.1.3.ge56e4f7 >=20 Acked-by: Rosen Xu 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 2BCA1A00E6 for ; Tue, 16 Apr 2019 09:02:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 876DE1B471; Tue, 16 Apr 2019 09:02:48 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id ED3611B46C; Tue, 16 Apr 2019 09:02:46 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2019 00:02:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,355,1549958400"; d="scan'208";a="165122157" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga001.fm.intel.com with ESMTP; 16 Apr 2019 00:02:45 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 16 Apr 2019 00:02:35 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.42]) with mapi id 14.03.0415.000; Tue, 16 Apr 2019 15:02:24 +0800 From: "Xu, Rosen" To: Li Qiang , "Zhang, Tianfei" CC: "dev@dpdk.org" , "stable@dpdk.org" , "liq3ea@gmail.com" Thread-Topic: [PATCH v3] drivers: ifpga_rawdev: fix fd leak in rte_fpga_do_pr Thread-Index: AQHU9BIcw1kGGXK8GU+hCPUOw0HSiqY+XGBg Date: Tue, 16 Apr 2019 07:02:24 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A6B02B5@SHSMSX104.ccr.corp.intel.com> References: <20190416050514.2784-1-liq3ea@163.com> In-Reply-To: <20190416050514.2784-1-liq3ea@163.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzYwOWIyYzUtYzA2NS00NzZjLWIzMjQtZDcxOWQzZWVjZmQ5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoid1pUNFZsS1pYdENoSVY1MllyMHQySFc4bW5Za1h3SkxPOVRVOGR6MitxQjloSUdUVlN2aENONmZxSTZrSCtQWCJ9 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 v3] 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: <20190416070224.PCrYmOmarsrEKilskaescztVK-Xx1YcdPCNQoX4fp7A@z> > -----Original Message----- > From: Li Qiang [mailto:liq3ea@163.com] > Sent: Tuesday, April 16, 2019 13:05 > To: Xu, Rosen ; Zhang, Tianfei > > Cc: dev@dpdk.org; stable@dpdk.org; liq3ea@gmail.com; Li Qiang > > Subject: [PATCH v3] 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 > Coverity issue: 279441 > Fixes: ef1e8ede3da59e("raw/ifpga: add Intel FPGA bus rawdev driver") > Cc: stable@dpdk.org >=20 > Signed-off-by: Li Qiang > --- > Change since v2: add proper tags in commit message >=20 > drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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 > @@ -244,7 +244,8 @@ 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; > + ret =3D -EINVAL; > + goto close_fd; > } > buffer_size =3D file_stat.st_size; > IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size); > -- > 2.19.1.3.ge56e4f7 >=20 Acked-by: Rosen Xu