[dpdk-dev] [PATCH] librte_metrics: fix memory leak
Gaurav Singh
gaurav1086 at gmail.com
Sat Aug 1 08:08:38 CEST 2020
Fix memory leak issue
Signed-off-by: Gaurav Singh <gaurav1086 at gmail.com>
---
lib/librte_metrics/rte_metrics_telemetry.c | 24 +++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c
index 289ebae0b..9fbe59c62 100644
--- a/lib/librte_metrics/rte_metrics_telemetry.c
+++ b/lib/librte_metrics/rte_metrics_telemetry.c
@@ -41,12 +41,19 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)
}
xstats_names = malloc(sizeof(*xstats_names) * num_xstats);
+ if (xstats_names == NULL) {
+ METRICS_LOG_ERR("Failed to malloc memory for xstats_names");
+ ret = -ENOMEM;
+ return ret;
+ }
+
eth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name)
* num_xstats);
- if (eth_xstats_names == NULL || xstats_names == NULL) {
+ if (eth_xstats_names == NULL) {
METRICS_LOG_ERR("Failed to malloc memory for xstats_names");
ret = -ENOMEM;
- goto free_xstats;
+ free(xstats_names);
+ return ret;
}
if (rte_eth_xstats_get_names(port_id,
@@ -54,7 +61,7 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)
METRICS_LOG_ERR("rte_eth_xstats_get_names(%u) len %d failed",
port_id, num_xstats);
ret = -EPERM;
- goto free_xstats;
+ return ret;
}
for (i = 0; i < num_xstats; i++)
@@ -63,9 +70,6 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)
if (ret < 0)
METRICS_LOG_ERR("rte_metrics_reg_names failed - metrics may already be registered");
-free_xstats:
- free(eth_xstats_names);
- free(xstats_names);
return ret;
}
@@ -167,9 +171,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports,
}
metrics = malloc(sizeof(struct rte_metric_value) * num_metrics);
+ if (metrics == NULL) {
+ METRICS_LOG_ERR("Cannot allocate memory");
+ return -ENOMEM;
+ }
+
names = malloc(sizeof(struct rte_metric_name) * num_metrics);
- if (metrics == NULL || names == NULL) {
+ if (names == NULL) {
METRICS_LOG_ERR("Cannot allocate memory");
+ free(metrics);
return -ENOMEM;
}
--
2.17.1
More information about the dev
mailing list