diff mbox series

[05/21] app/test-dma-perf: replace strtok with strtok_r

Message ID	20231113104550.2138654-6-haijie1@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, Cheng Jiang <honest.jiang@foxmail.com> CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com> Subject: [PATCH 05/21] app/test-dma-perf: replace strtok with strtok_r Date: Mon, 13 Nov 2023 18:45:34 +0800 Message-ID: <20231113104550.2138654-6-haijie1@huawei.com> In-Reply-To: <20231113104550.2138654-1-haijie1@huawei.com> References: <20231113104550.2138654-1-haijie1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	replace strtok with strtok_r \| [00/21] replace strtok with strtok_r [01/21] app/graph: replace strtok with strtok_r [02/21] app/test-bbdev: replace strtok with strtok_r [03/21] app/test-compress-perf: replace strtok with strtok_r [04/21] app/test-crypto-perf: replace strtok with strtok_r [05/21] app/test-dma-perf: replace strtok with strtok_r [06/21] app/test-fib: replace strtok with strtok_r [07/21] app/dpdk-test-flow-perf: replace strtok with strtok_r [08/21] app/test-mldev: replace strtok with strtok_r [09/21] lib/dmadev: replace strtok with strtok_r [10/21] lib/eal: replace strtok with strtok_r [11/21] lib/ethdev: replace strtok with strtok_r [12/21] lib/eventdev: replace strtok with strtok_r [13/21] lib/telemetry: replace strtok with strtok_r [14/21] lib/telemetry: replace strtok with strtok_r [15/21] bus/fslmc: replace strtok with strtok_r [16/21] common/cnxk: replace strtok with strtok_r [17/21] event/cnxk: replace strtok with strtok_r [18/21] net/ark: replace strtok with strtok_r [19/21] raw/cnxk_gpio: replace strtok with strtok_r [20/21] examples/l2fwd-crypto: replace strtok with strtok_r [21/21] examples/vhost: replace strtok with strtok_r

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Jie Hai Nov. 13, 2023, 10:45 a.m. UTC

  Multiple threads calling the same function may cause condition
race issues, which often leads to abnormal behavior and can cause
more serious vulnerabilities such as abnormal termination, denial
of service, and compromised data integrity.

The strtok() is non-reentrant, it is better to replace it with a
reentrant function.

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 app/test-dma-perf/main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/app/test-dma-perf/main.c b/app/test-dma-perf/main.c
index e5bccc27da5e..38780939578e 100644
--- a/app/test-dma-perf/main.c
+++ b/app/test-dma-perf/main.c
@@ -164,6 +164,7 @@  parse_lcore(struct test_configure *test_case, const char *value)
 	uint16_t len;
 	char *input;
 	struct lcore_dma_map_t *lcore_dma_map;
+	char *sp = NULL;
 
 	if (test_case == NULL || value == NULL)
 		return -1;
@@ -175,7 +176,7 @@  parse_lcore(struct test_configure *test_case, const char *value)
 
 	memset(lcore_dma_map, 0, sizeof(struct lcore_dma_map_t));
 
-	char *token = strtok(input, ", ");
+	char *token = strtok_r(input, ", ", &sp);
 	while (token != NULL) {
 		if (lcore_dma_map->cnt >= MAX_LCORE_NB) {
 			free(input);
@@ -185,7 +186,7 @@  parse_lcore(struct test_configure *test_case, const char *value)
 		uint16_t lcore_id = atoi(token);
 		lcore_dma_map->lcores[lcore_dma_map->cnt++] = lcore_id;
 
-		token = strtok(NULL, ", ");
+		token = strtok_r(NULL, ", ", &sp);
 	}
 
 	free(input);
@@ -201,6 +202,7 @@  parse_lcore_dma(struct test_configure *test_case, const char *value)
 	char *start, *end, *substr;
 	uint16_t lcore_id;
 	int ret = 0;
+	char *sp = NULL;
 
 	if (test_case == NULL || value == NULL)
 		return -1;
@@ -216,7 +218,7 @@  parse_lcore_dma(struct test_configure *test_case, const char *value)
 		goto out;
 	}
 
-	substr = strtok(addrs, ",");
+	substr = strtok_r(addrs, ",", &sp);
 	if (substr == NULL) {
 		fprintf(stderr, "No input DMA address\n");
 		ret = -1;
@@ -258,7 +260,7 @@  parse_lcore_dma(struct test_configure *test_case, const char *value)
 		strlcpy(lcore_dma_map->dma_names[lcore_dma_map->cnt], ptrs[1],
 				RTE_DEV_NAME_MAX_LEN);
 		lcore_dma_map->cnt++;
-		substr = strtok(NULL, ",");
+		substr = strtok_r(NULL, ",", &sp);
 	} while (substr != NULL);
 
 out:
@@ -486,6 +488,7 @@  main(int argc, char *argv[])
 	char *rst_path_ptr = NULL;
 	char rst_path[PATH_MAX];
 	int new_argc;
+	char *sp = NULL;
 
 	memset(args, 0, sizeof(args));
 
@@ -504,7 +507,7 @@  main(int argc, char *argv[])
 	}
 	if (rst_path_ptr == NULL) {
 		strlcpy(rst_path, cfg_path_ptr, PATH_MAX);
-		char *token = strtok(basename(rst_path), ".");
+		char *token = strtok_r(basename(rst_path), ".", &sp);
 		if (token == NULL) {
 			printf("Config file error.\n");
 			return -1;