diff mbox series

[01/16] eal: verify strdup return value

Message ID	20231110063653.5948-2-fengchengwen@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Chengwen Feng <fengchengwen@huawei.com> To: <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Bruce Richardson <bruce.richardson@intel.com>, Ciara Power <ciara.power@intel.com>, Keith Wiles <keith.wiles@intel.com>, Jianfeng Tan <jianfeng.tan@intel.com>, Jeff Guo <jia.guo@intel.com> CC: <dev@dpdk.org> Subject: [PATCH 01/16] eal: verify strdup return value Date: Fri, 10 Nov 2023 06:36:38 +0000 Message-ID: <20231110063653.5948-2-fengchengwen@huawei.com> In-Reply-To: <20231110063653.5948-1-fengchengwen@huawei.com> References: <20231110063653.5948-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	verify strdup return value \| [00/16] verify strdup return value [01/16] eal: verify strdup return value [02/16] bus/dpaa: verify strdup return value [03/16] bus/fslmc: verify strdup return value [04/16] bus/vdev: verify strdup return value [05/16] dma/idxd: verify strdup return value [06/16] event/cnxk: verify strdup return value [07/16] net/failsafe: fix memory leak when parse args [08/16] net/nfp: verify strdup return value [09/16] app/dumpcap: verify strdup return value [10/16] app/pdump: verify strdup return value [11/16] app/test: verify strdup return value [12/16] app/test-crypto-perf: verify strdup return value [13/16] app/test-dma-perf: verify strdup return value [14/16] app/testpmd: verify strdup return value [15/16] examples/qos_sched: fix memory leak when parse args [16/16] examples/vhost: verify strdup return value

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

fengchengwen Nov. 10, 2023, 6:36 a.m. UTC

  Add verify strdup() return value logic.

Fixes: 293c53d8b23c ("eal: add telemetry callbacks")
Fixes: 0d0f478d0483 ("eal/linux: add uevent parse and process")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 lib/eal/common/eal_common_options.c | 24 ++++++++++++++++++++++--
 lib/eal/linux/eal_dev.c             |  3 +++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
index a6d21f1cba..8b5a4632dd 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -226,6 +226,8 @@  eal_save_args(int argc, char **argv)
 		if (strcmp(argv[i], "--") == 0)
 			break;
 		eal_args[i] = strdup(argv[i]);
+		if (eal_args[i] == NULL)
+			goto error;
 	}
 	eal_args[i++] = NULL; /* always finish with NULL */
 
@@ -235,13 +237,31 @@  eal_save_args(int argc, char **argv)
 
 	eal_app_args = calloc(argc - i + 1, sizeof(*eal_args));
 	if (eal_app_args == NULL)
-		return -1;
+		goto error;
 
-	for (j = 0; i < argc; j++, i++)
+	for (j = 0; i < argc; j++, i++) {
 		eal_app_args[j] = strdup(argv[i]);
+		if (eal_app_args[j] == NULL)
+			goto error;
+	}
 	eal_app_args[j] = NULL;
 
 	return 0;
+
+error:
+	if (eal_app_args != NULL) {
+		i = 0;
+		while (eal_app_args[i] != NULL)
+			free(eal_app_args[i++]);
+		free(eal_app_args);
+		eal_app_args = NULL;
+	}
+	i = 0;
+	while (eal_args[i] != NULL)
+		free(eal_args[i++]);
+	free(eal_args);
+	eal_args = NULL;
+	return -1;
 }
 #endif
 
diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c
index ac76f6174d..df3cd6b39a 100644
--- a/lib/eal/linux/eal_dev.c
+++ b/lib/eal/linux/eal_dev.c
@@ -181,7 +181,10 @@  dev_uev_parse(const char *buf, struct rte_dev_event *event, int length)
 			buf += 14;
 			i += 14;
 			strlcpy(pci_slot_name, buf, sizeof(subsystem));
+			free(event->devname);
 			event->devname = strdup(pci_slot_name);
+			if (event->devname == NULL)
+				return -1;
 		}
 		for (; i < length; i++) {
 			if (*buf == '\0')