diff mbox series

[18/20] raw/ifpga/base: fix memory leaks in error handlings

Message ID	tencent_D84ED137D548814867CC048FD7E94504BA06@qq.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	David Marchand
Headers	Message-ID: <tencent_D84ED137D548814867CC048FD7E94504BA06@qq.com> From: Weiguo Li <liwg06@foxmail.com> To: dev@dpdk.org Cc: adypodoman@gmail.com, xiaoyun.li@intel.com, tianfei.zhang@intel.com, bruce.richardson@intel.com, ivan.malov@oktetlabs.ru, jgrajcia@cisco.com, hkalra@marvell.com, ying.a.wang@intel.com, ting.xu@intel.com, simei.su@intel.com, qiming.yang@intel.com, motih@mellanox.com, shreyansh.jain@nxp.com, skoteshwar@marvell.com, stephen@networkplumber.org, kalesh-anakkur.purayil@broadcom.com, somnath.kotur@broadcom.com, declan.doherty@intel.com, gakhil@marvell.com, nicolas.chautru@intel.com Subject: [PATCH 18/20] raw/ifpga/base: fix memory leaks in error handlings Date: Wed, 23 Feb 2022 02:18:16 +0800 In-Reply-To: <cover.1645551559.git.liwg06@foxmail.com> References: <cover.1645551559.git.liwg06@foxmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	fix memory leaks in error handling \| [00/20] fix memory leaks in error handling [01/20] baseband/acc100: fix a memory leak in acc100 queue setup [02/20] common/dpaax: fix a memory leak in iterate dir [03/20] crypto/dpaa2_sec: fix memory leaks in error handlings [04/20] crypto/qat: fix a memory leak when set encrypt key fail [05/20] net/bnxt: fix a memory leak in error handling [06/20] net/bnxt: fix 'ctx' memory leak when new malloc fail [07/20] net/bnx2x: add clean up for 'rxq' to avoid a memory leak [08/20] net/cnxk: free 'node' memory when node add fail [09/20] net/dpaa: fix a memory leak when validation fail [10/20] net/failsafe: fix a memory leak in error handling [11/20] net/iavf: fix a memory leak in error handling [12/20] net/ice: goto clean up lable to avoid memory leak [13/20] net/ice: fix memory leaks in error handlings [14/20] net/ice: avoid fix memory leaks in register parser [15/20] net/memif: fix some memory leaks in error handlings [16/20] net/sfc: fix a memory leak in error handling [17/20] net/vmxnet3: fix memory leaks in error handlings [18/20] raw/ifpga/base: fix memory leaks in error handlings [19/20] raw/ntb: fix some memory leaks in error handlings [20/20] regex/mlx5: fix a memory leak in error handling

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Weiguo Li Feb. 22, 2022, 6:18 p.m. UTC

  1) in ifpga_enumerate.c:
The memory 'feature' is stored by TAILQ_INSERT_TAIL() at the end of the
function. When function returned early in error handling, 'feature' is
not released and leads to a memory leak.

2) in opae_eth_group.c and opae_i2c.c
These function return 'dev' when success and return NULL when validation
failed or some error occur. In the latter case 'dev' is not released and
leads to a memory leak.

Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")
Fixes: 12f92a513a13 ("raw/ifpga/base: fix retimer link status")
Fixes: 15d21c851028 ("raw/ifpga/base: add I2C and at24 EEPROM driver")

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/raw/ifpga/base/ifpga_enumerate.c | 10 ++++++++--
 drivers/raw/ifpga/base/opae_eth_group.c  |  1 +
 drivers/raw/ifpga/base/opae_i2c.c        |  5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/raw/ifpga/base/ifpga_enumerate.c b/drivers/raw/ifpga/base/ifpga_enumerate.c
index 48b8af4587..ae7bc9326d 100644
--- a/drivers/raw/ifpga/base/ifpga_enumerate.c
+++ b/drivers/raw/ifpga/base/ifpga_enumerate.c
@@ -100,12 +100,16 @@  build_info_add_sub_feature(struct build_feature_devs_info *binfo,
 			(unsigned long long)feature->phys_addr, size);
 
 	if (vec_cnt) {
-		if (vec_start + vec_cnt <= vec_start)
+		if (vec_start + vec_cnt <= vec_start) {
+			opae_free(feature);
 			return -EINVAL;
+		}
 
 		ctx = zmalloc(sizeof(*ctx) * vec_cnt);
-		if (!ctx)
+		if (!ctx) {
+			opae_free(feature);
 			return -ENOMEM;
+		}
 
 		for (i = 0; i < vec_cnt; i++) {
 			ctx[i].eventfd = -1;
@@ -130,6 +134,8 @@  build_info_add_sub_feature(struct build_feature_devs_info *binfo,
 		TAILQ_INSERT_TAIL(&hw->port[port_id].feature_list,
 				feature, next);
 	} else {
+		opae_free(feature->ctx);
+		opae_free(feature);
 		return -EFAULT;
 	}
 	return ret;
diff --git a/drivers/raw/ifpga/base/opae_eth_group.c b/drivers/raw/ifpga/base/opae_eth_group.c
index be28954e05..cd9b2443c7 100644
--- a/drivers/raw/ifpga/base/opae_eth_group.c
+++ b/drivers/raw/ifpga/base/opae_eth_group.c
@@ -297,6 +297,7 @@  struct eth_group_device *eth_group_probe(void *base)
 
 	if (eth_group_hw_init(dev)) {
 		dev_err(dev, "eth group hw init fail\n");
+		opae_free(dev);
 		return NULL;
 	}
 
diff --git a/drivers/raw/ifpga/base/opae_i2c.c b/drivers/raw/ifpga/base/opae_i2c.c
index 598eab5742..0a9abff14d 100644
--- a/drivers/raw/ifpga/base/opae_i2c.c
+++ b/drivers/raw/ifpga/base/opae_i2c.c
@@ -479,6 +479,7 @@  struct altera_i2c_dev *altera_i2c_probe(void *base)
 
 	if (dev->i2c_param.devid != 0xEE011) {
 		dev_err(dev, "find a invalid i2c master\n");
+		opae_free(dev);
 		return NULL;
 	}
 
@@ -494,8 +495,10 @@  struct altera_i2c_dev *altera_i2c_probe(void *base)
 	dev->i2c_clk = dev->i2c_param.ref_clk * 1000000;
 	dev->xfer = altera_i2c_xfer;
 
-	if (pthread_mutex_init(&dev->lock, NULL))
+	if (pthread_mutex_init(&dev->lock, NULL)) {
+		opae_free(dev);
 		return NULL;
+	}
 	dev->mutex = &dev->lock;
 
 	altera_i2c_hardware_init(dev);