[dpdk-dev] [PATCH] lib/metrics: fix memory leak
Gaurav Singh
gaurav1086 at gmail.com
Sat Aug 8 18:39:06 CEST 2020
fix memory leak
Fixes: c5b7197f66 ("telemetry: move some functions to metrics library")
Signed-off-by: Gaurav Singh <gaurav1086 at gmail.com>
---
lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c
index 289ebae0b..7b6d1063c 100644
--- a/lib/librte_metrics/rte_metrics_telemetry.c
+++ b/lib/librte_metrics/rte_metrics_telemetry.c
@@ -41,12 +41,17 @@ 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");
+ return -ENOMEM;
+ }
+
eth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name)
* num_xstats);
- if (eth_xstats_names == NULL || xstats_names == NULL) {
- METRICS_LOG_ERR("Failed to malloc memory for xstats_names");
- ret = -ENOMEM;
- goto free_xstats;
+ if (eth_xstats_names == NULL) {
+ METRICS_LOG_ERR("Failed to malloc memory for eth_xstats_names");
+ free(xstats_names);
+ return -ENOMEM;
}
if (rte_eth_xstats_get_names(port_id,
@@ -167,9 +172,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