Skip to contentSkip to conversation

linuxapp, eal: Fix the memory leak issue of logid

PATCH Superseded Ziye Yang 1 participant 1 message Aug 30, 2018

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Ziye Yang

author
#0 lore raw

PATCH v2 1/1 linuxapp, eal: Fix the memory leak issue of logid

From: Ziye Yang <[email protected]>

This patch is used to fix the memory leak issue of logid. We use the ASAN test in SPDK when intergrating DPDK and find this issue.

---
 lib/librte_eal/linuxapp/eal/eal.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
lib/librte_eal/linuxapp/eal/eal.c +12 -1
index e59ac65..0ddd660 100644
@@ -793,7 +793,7 @@ static void rte_eal_init_alert(const char *msg)
 	int i, fctret, ret;
 	pthread_t thread_id;
 	static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
-	const char *logid;
+	char *logid;
 	char cpuset[RTE_CPU_AFFINITY_STR_LEN];
 	char thread_name[RTE_MAX_THREAD_NAME_LEN];
 
@@ -812,6 +812,12 @@ static void rte_eal_init_alert(const char *msg)
 
 	logid = strrchr(argv[0], '/');
 	logid = strdup(logid ? logid + 1: argv[0]);
+	if (!logid) {
+		rte_eal_init_alert("Cannot allocate memory for logid\n");
+		rte_errno = ENOMEM;
+		rte_atomic32_clear(&run_once);
+		return -1;
+	}
 
 	thread_id = pthread_self();
 
@@ -823,6 +829,7 @@ static void rte_eal_init_alert(const char *msg)
 	if (rte_eal_cpu_init() < 0) {
 		rte_eal_init_alert("Cannot detect lcores.");
 		rte_errno = ENOTSUP;
+		free(logid);
 		return -1;
 	}
 
@@ -831,6 +838,7 @@ static void rte_eal_init_alert(const char *msg)
 		rte_eal_init_alert("Invalid 'command line' arguments.");
 		rte_errno = EINVAL;
 		rte_atomic32_clear(&run_once);
+		free(logid);
 		return -1;
 	}
 
@@ -844,6 +852,7 @@ static void rte_eal_init_alert(const char *msg)
 	if (eal_option_device_parse()) {
 		rte_errno = ENODEV;
 		rte_atomic32_clear(&run_once);
+		free(logid);
 		return -1;
 	}
 
@@ -851,8 +860,10 @@ static void rte_eal_init_alert(const char *msg)
 
 	if (rte_eal_intr_init() < 0) {
 		rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+		free(logid);
 		return -1;
 	}
+	free(logid);
 
 	/* Put mp channel init before bus scan so that we can init the vdev
 	 * bus through mp channel in the secondary process before the bus scan.
Signature · 1 line
1.9.3