From patchwork Thu Aug 30 09:22:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziye Yang X-Patchwork-Id: 44006 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A42EA2BF7; Thu, 30 Aug 2018 11:22:32 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 504C12B92 for ; Thu, 30 Aug 2018 11:22:31 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Aug 2018 02:22:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,306,1531810800"; d="scan'208";a="66291226" Received: from clim63-mobl1.gar.corp.intel.com (HELO localhost.localdomain) ([10.255.131.98]) by fmsmga007.fm.intel.com with ESMTP; 30 Aug 2018 02:22:28 -0700 From: Ziye Yang To: dev@dpdk.org Cc: Ziye Yang Date: Thu, 30 Aug 2018 17:22:19 +0800 Message-Id: <1535620939-11861-1-git-send-email-ziye.yang@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dpdk-dev] [PATCH v2] linuxapp, eal: Fix the memory leak issue of logid X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ziye Yang 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. Signed-off-by: Ziye Yang --- lib/librte_eal/linuxapp/eal/eal.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index e59ac65..0ddd660 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -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.