* [PATCH 1/1] net/ixgbe: fix memoy leak after device init failure
@ 2023-12-01 10:47 Yunjian Wang
2023-12-14 1:46 ` [PATCH RESEND] " Yunjian Wang
2023-12-14 6:44 ` [PATCH v2] " Yunjian Wang
0 siblings, 2 replies; 5+ messages in thread
From: Yunjian Wang @ 2023-12-01 10:47 UTC (permalink / raw)
To: dev
Cc: qiming.yang, wenjun1.wu, xudingke, jerry.lilijun, Yunjian Wang, stable
In ixgbe_ipsec_ctx_create() allocated memory for the 'security_ctx',
we should free it when errors occur, otherwise it will lead
to memory leak.
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index d6cf00317e..a32d3a6d7c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1190,7 +1190,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
diag = ixgbe_validate_eeprom_checksum(hw, &csum);
if (diag != IXGBE_SUCCESS) {
PMD_INIT_LOG(ERR, "The EEPROM checksum is not valid: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
#ifdef RTE_LIBRTE_IXGBE_BYPASS
@@ -1228,7 +1229,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
PMD_INIT_LOG(ERR, "Unsupported SFP+ Module");
if (diag) {
PMD_INIT_LOG(ERR, "Hardware Initialization Failure: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
/* Reset the hw statistics */
@@ -1248,7 +1250,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
"Failed to allocate %u bytes needed to store "
"MAC addresses",
RTE_ETHER_ADDR_LEN * hw->mac.num_rar_entries);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* Copy the permanent MAC address */
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
@@ -1263,7 +1266,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
RTE_ETHER_ADDR_LEN * IXGBE_VMDQ_NUM_UC_MAC);
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* initialize the vfta */
@@ -1347,6 +1351,11 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
eth_dev->data->mac_addrs = NULL;
rte_free(eth_dev->data->hash_mac_addrs);
eth_dev->data->hash_mac_addrs = NULL;
+err_exit:
+#ifdef RTE_LIB_SECURITY
+ rte_free(eth_dev->security_ctx);
+ eth_dev->security_ctx = NULL;
+#endif
return ret;
}
--
2.33.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH RESEND] net/ixgbe: fix memoy leak after device init failure
2023-12-01 10:47 [PATCH 1/1] net/ixgbe: fix memoy leak after device init failure Yunjian Wang
@ 2023-12-14 1:46 ` Yunjian Wang
2023-12-14 6:44 ` [PATCH v2] " Yunjian Wang
1 sibling, 0 replies; 5+ messages in thread
From: Yunjian Wang @ 2023-12-14 1:46 UTC (permalink / raw)
To: dev
Cc: qi.z.zhang, qiming.yang, wenjun1.wu, xudingke, jerry.lilijun,
Yunjian Wang, stable
In ixgbe_ipsec_ctx_create() allocated memory for the 'security_ctx',
we should free it when errors occur, otherwise it will lead
to memory leak.
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index d6cf00317e..a32d3a6d7c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1190,7 +1190,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
diag = ixgbe_validate_eeprom_checksum(hw, &csum);
if (diag != IXGBE_SUCCESS) {
PMD_INIT_LOG(ERR, "The EEPROM checksum is not valid: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
#ifdef RTE_LIBRTE_IXGBE_BYPASS
@@ -1228,7 +1229,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
PMD_INIT_LOG(ERR, "Unsupported SFP+ Module");
if (diag) {
PMD_INIT_LOG(ERR, "Hardware Initialization Failure: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
/* Reset the hw statistics */
@@ -1248,7 +1250,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
"Failed to allocate %u bytes needed to store "
"MAC addresses",
RTE_ETHER_ADDR_LEN * hw->mac.num_rar_entries);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* Copy the permanent MAC address */
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
@@ -1263,7 +1266,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
RTE_ETHER_ADDR_LEN * IXGBE_VMDQ_NUM_UC_MAC);
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* initialize the vfta */
@@ -1347,6 +1351,11 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
eth_dev->data->mac_addrs = NULL;
rte_free(eth_dev->data->hash_mac_addrs);
eth_dev->data->hash_mac_addrs = NULL;
+err_exit:
+#ifdef RTE_LIB_SECURITY
+ rte_free(eth_dev->security_ctx);
+ eth_dev->security_ctx = NULL;
+#endif
return ret;
}
--
2.33.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] net/ixgbe: fix memoy leak after device init failure
2023-12-01 10:47 [PATCH 1/1] net/ixgbe: fix memoy leak after device init failure Yunjian Wang
2023-12-14 1:46 ` [PATCH RESEND] " Yunjian Wang
@ 2023-12-14 6:44 ` Yunjian Wang
2023-12-18 3:07 ` [PATCH v2 RESEND] " Yunjian Wang
2023-12-18 5:13 ` Zhang, Qi Z
1 sibling, 2 replies; 5+ messages in thread
From: Yunjian Wang @ 2023-12-14 6:44 UTC (permalink / raw)
To: dev
Cc: qi.z.zhang, qiming.yang, wenjun1.wu, xudingke, jerry.lilijun,
Yunjian Wang, stable
In ixgbe_ipsec_ctx_create() allocated memory for the 'security_ctx',
we should free it when errors occur, otherwise it will lead
to memory leak.
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
v2: just resend the patch, maintainer feedback cannot find it.
---
drivers/net/ixgbe/ixgbe_ethdev.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index d6cf00317e..a32d3a6d7c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1190,7 +1190,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
diag = ixgbe_validate_eeprom_checksum(hw, &csum);
if (diag != IXGBE_SUCCESS) {
PMD_INIT_LOG(ERR, "The EEPROM checksum is not valid: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
#ifdef RTE_LIBRTE_IXGBE_BYPASS
@@ -1228,7 +1229,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
PMD_INIT_LOG(ERR, "Unsupported SFP+ Module");
if (diag) {
PMD_INIT_LOG(ERR, "Hardware Initialization Failure: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
/* Reset the hw statistics */
@@ -1248,7 +1250,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
"Failed to allocate %u bytes needed to store "
"MAC addresses",
RTE_ETHER_ADDR_LEN * hw->mac.num_rar_entries);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* Copy the permanent MAC address */
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
@@ -1263,7 +1266,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
RTE_ETHER_ADDR_LEN * IXGBE_VMDQ_NUM_UC_MAC);
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* initialize the vfta */
@@ -1347,6 +1351,11 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
eth_dev->data->mac_addrs = NULL;
rte_free(eth_dev->data->hash_mac_addrs);
eth_dev->data->hash_mac_addrs = NULL;
+err_exit:
+#ifdef RTE_LIB_SECURITY
+ rte_free(eth_dev->security_ctx);
+ eth_dev->security_ctx = NULL;
+#endif
return ret;
}
--
2.33.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 RESEND] net/ixgbe: fix memoy leak after device init failure
2023-12-14 6:44 ` [PATCH v2] " Yunjian Wang
@ 2023-12-18 3:07 ` Yunjian Wang
2023-12-18 5:13 ` Zhang, Qi Z
1 sibling, 0 replies; 5+ messages in thread
From: Yunjian Wang @ 2023-12-18 3:07 UTC (permalink / raw)
To: dev
Cc: qi.z.zhang, qiming.yang, wenjun1.wu, xudingke, jerry.lilijun,
Yunjian Wang, stable
In ixgbe_ipsec_ctx_create() allocated memory for the 'security_ctx',
we should free it when errors occur, otherwise it will lead
to memory leak.
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
v2: just resend the patch, maintainer feedback cannot find it.
---
drivers/net/ixgbe/ixgbe_ethdev.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index d6cf00317e..a32d3a6d7c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1190,7 +1190,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
diag = ixgbe_validate_eeprom_checksum(hw, &csum);
if (diag != IXGBE_SUCCESS) {
PMD_INIT_LOG(ERR, "The EEPROM checksum is not valid: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
#ifdef RTE_LIBRTE_IXGBE_BYPASS
@@ -1228,7 +1229,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
PMD_INIT_LOG(ERR, "Unsupported SFP+ Module");
if (diag) {
PMD_INIT_LOG(ERR, "Hardware Initialization Failure: %d", diag);
- return -EIO;
+ ret = -EIO;
+ goto err_exit;
}
/* Reset the hw statistics */
@@ -1248,7 +1250,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
"Failed to allocate %u bytes needed to store "
"MAC addresses",
RTE_ETHER_ADDR_LEN * hw->mac.num_rar_entries);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* Copy the permanent MAC address */
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
@@ -1263,7 +1266,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
RTE_ETHER_ADDR_LEN * IXGBE_VMDQ_NUM_UC_MAC);
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_exit;
}
/* initialize the vfta */
@@ -1347,6 +1351,11 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
eth_dev->data->mac_addrs = NULL;
rte_free(eth_dev->data->hash_mac_addrs);
eth_dev->data->hash_mac_addrs = NULL;
+err_exit:
+#ifdef RTE_LIB_SECURITY
+ rte_free(eth_dev->security_ctx);
+ eth_dev->security_ctx = NULL;
+#endif
return ret;
}
--
2.33.0
^ permalink raw reply [flat|nested] 5+ messages in thread* RE: [PATCH v2 RESEND] net/ixgbe: fix memoy leak after device init failure
2023-12-14 6:44 ` [PATCH v2] " Yunjian Wang
2023-12-18 3:07 ` [PATCH v2 RESEND] " Yunjian Wang
@ 2023-12-18 5:13 ` Zhang, Qi Z
1 sibling, 0 replies; 5+ messages in thread
From: Zhang, Qi Z @ 2023-12-18 5:13 UTC (permalink / raw)
To: Yunjian Wang, dev
Cc: Yang, Qiming, Wu, Wenjun1, xudingke, jerry.lilijun, stable
> -----Original Message-----
> From: Yunjian Wang <wangyunjian@huawei.com>
> Sent: Monday, December 18, 2023 11:08 AM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming <qiming.yang@intel.com>;
> Wu, Wenjun1 <wenjun1.wu@intel.com>; xudingke@huawei.com;
> jerry.lilijun@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [PATCH v2 RESEND] net/ixgbe: fix memoy leak after device init failure
>
> In ixgbe_ipsec_ctx_create() allocated memory for the 'security_ctx', we should
> free it when errors occur, otherwise it will lead to memory leak.
>
> Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-18 5:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-01 10:47 [PATCH 1/1] net/ixgbe: fix memoy leak after device init failure Yunjian Wang
2023-12-14 1:46 ` [PATCH RESEND] " Yunjian Wang
2023-12-14 6:44 ` [PATCH v2] " Yunjian Wang
2023-12-18 3:07 ` [PATCH v2 RESEND] " Yunjian Wang
2023-12-18 5:13 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).