From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id EC0581B5B7; Wed, 17 Apr 2019 10:03:51 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Apr 2019 01:03:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,361,1549958400"; d="scan'208";a="136505567" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 01:03:50 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:03:50 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:03:49 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.21]) with mapi id 14.03.0415.000; Wed, 17 Apr 2019 16:03:47 +0800 From: "Xu, Rosen" To: "Pei, Andy" , "dev@dpdk.org" CC: "Kovacevic, Marko" , "liq3ea@163.com" , "stable@dpdk.org" Thread-Topic: [PATCH v2] raw/ifpga_rawdev: fix fd leak in rte fpga do pr Thread-Index: AQHU9O6Cr3ZqHcencESM4GfplUDIi6Y//hpw Date: Wed, 17 Apr 2019 08:03:47 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A6B85AA@SHSMSX104.ccr.corp.intel.com> References: <1555483757-48188-1-git-send-email-andy.pei@intel.com> <1555485388-50214-1-git-send-email-andy.pei@intel.com> In-Reply-To: <1555485388-50214-1-git-send-email-andy.pei@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWEzMjg2Y2MtOWIwZC00NzI2LWFkNzItMWE5MzAxMzhjMDc0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQjZxRkRHNjMwSlBEamVCQjc4cHptQnQyaEFadmQ0NllaVEdZM3o4dDZqbllRZGg2WVQ0ZVFBaHJMU0hcL0hJejEifQ== 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 v2] raw/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, 17 Apr 2019 08:03:52 -0000 > -----Original Message----- > From: Pei, Andy > Sent: Wednesday, April 17, 2019 15:16 > To: dev@dpdk.org > Cc: Pei, Andy ; Xu, Rosen ; > Kovacevic, Marko ; liq3ea@163.com; > stable@dpdk.org > Subject: [PATCH v2] raw/ifpga_rawdev: fix fd leak in rte fpga do pr >=20 > In rte_fpga_do_pr() function, if 'stat' returns error, > rte_fpga_do_pr() returns -EINVAL without closing the 'file_fd' that has b= een > opened. > After this patch, 'file_fd' is closed before rte_fpga_do_pr() returns -EI= NVAL > when 'stat' returns error >=20 > Coverity issue: 279441 > Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver") > Cc: rosen.xu@intel.com > Cc: marko.kovacevic@intel.com > Cc: liq3ea@163.com > Cc: andy.pei@intel.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Andy Pei > --- > --- > 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 da772d0..eff001b 100644 > --- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > +++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > @@ -244,7 +244,8 @@ > 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); > -- > 1.8.3.1 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 DCD75A00E6 for ; Wed, 17 Apr 2019 10:03:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 64BAC1B5BD; Wed, 17 Apr 2019 10:03:54 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id EC0581B5B7; Wed, 17 Apr 2019 10:03:51 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Apr 2019 01:03:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,361,1549958400"; d="scan'208";a="136505567" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 01:03:50 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:03:50 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:03:49 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.21]) with mapi id 14.03.0415.000; Wed, 17 Apr 2019 16:03:47 +0800 From: "Xu, Rosen" To: "Pei, Andy" , "dev@dpdk.org" CC: "Kovacevic, Marko" , "liq3ea@163.com" , "stable@dpdk.org" Thread-Topic: [PATCH v2] raw/ifpga_rawdev: fix fd leak in rte fpga do pr Thread-Index: AQHU9O6Cr3ZqHcencESM4GfplUDIi6Y//hpw Date: Wed, 17 Apr 2019 08:03:47 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73A6B85AA@SHSMSX104.ccr.corp.intel.com> References: <1555483757-48188-1-git-send-email-andy.pei@intel.com> <1555485388-50214-1-git-send-email-andy.pei@intel.com> In-Reply-To: <1555485388-50214-1-git-send-email-andy.pei@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWEzMjg2Y2MtOWIwZC00NzI2LWFkNzItMWE5MzAxMzhjMDc0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQjZxRkRHNjMwSlBEamVCQjc4cHptQnQyaEFadmQ0NllaVEdZM3o4dDZqbllRZGg2WVQ0ZVFBaHJMU0hcL0hJejEifQ== 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 v2] raw/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: <20190417080347.47oAqaj4lm14sOy8Fa-V9wUtzqsFAQ2AUnUW40TDDhU@z> > -----Original Message----- > From: Pei, Andy > Sent: Wednesday, April 17, 2019 15:16 > To: dev@dpdk.org > Cc: Pei, Andy ; Xu, Rosen ; > Kovacevic, Marko ; liq3ea@163.com; > stable@dpdk.org > Subject: [PATCH v2] raw/ifpga_rawdev: fix fd leak in rte fpga do pr >=20 > In rte_fpga_do_pr() function, if 'stat' returns error, > rte_fpga_do_pr() returns -EINVAL without closing the 'file_fd' that has b= een > opened. > After this patch, 'file_fd' is closed before rte_fpga_do_pr() returns -EI= NVAL > when 'stat' returns error >=20 > Coverity issue: 279441 > Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver") > Cc: rosen.xu@intel.com > Cc: marko.kovacevic@intel.com > Cc: liq3ea@163.com > Cc: andy.pei@intel.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Andy Pei > --- > --- > 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 da772d0..eff001b 100644 > --- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > +++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c > @@ -244,7 +244,8 @@ > 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); > -- > 1.8.3.1 Acked-by: Rosen Xu