diff mbox series

[v5,01/25] app/graph: replace strtok with reentrant version

Message ID	20241108110404.18317-2-haijie1@huawei.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	David Marchand
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Sunil Kumar Kori <skori@marvell.com>, Rakesh Kudurumalla <rkudurumalla@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, Jerin Jacob <jerinj@marvell.com> CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <haijie1@huawei.com>, <huangdengdui@huawei.com> Subject: [PATCH v5 01/25] app/graph: replace strtok with reentrant version Date: Fri, 8 Nov 2024 19:03:40 +0800 Message-ID: <20241108110404.18317-2-haijie1@huawei.com> In-Reply-To: <20241108110404.18317-1-haijie1@huawei.com> References: <20231113104550.2138654-1-haijie1@huawei.com> <20241108110404.18317-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	[v5,01/25] app/graph: replace strtok with reentrant version \| [v5,00/25] [v5,01/25] app/graph: replace strtok with reentrant version [v5,02/25] app/bbdev: replace strtok with reentrant version [v5,03/25] app/compress-perf: replace strtok with reentrant version [v5,04/25] app/crypto-perf: replace strtok with reentrant version [v5,05/25] app/dma-perf: replace strtok with reentrant version [v5,06/25] app/flow-perf: replace strtok with reentrant version [v5,07/25] app/test-mldev: replace strtok with reentrant version [v5,08/25] app/test-fib: replace strtok with reentrant version [v5,09/25] dmadev: replace strtok with reentrant version [v5,10/25] eal: replace strtok with reentrant version [v5,11/25] ethdev: replace strtok with reentrant version [v5,12/25] eventdev: replace strtok with reentrant version [v5,13/25] security: replace strtok with reentrant version [v5,14/25] telemetry: replace strtok with reentrant version [v5,15/25] bus/fslmc: replace strtok with reentrant version [v5,16/25] common/cnxk: replace strtok with reentrant version [v5,17/25] event/cnxk: replace strtok with reentrant version [v5,18/25] net/ark: replace strtok with reentrant version [v5,19/25] raw/cnxk_gpio: replace strtok with reentrant version [v5,20/25] net/cnxk: replace strtok with reentrant version [v5,21/25] common/qat: replace strtok with reentrant version [v5,22/25] net/mlx5: replace strtok with reentrant version [v5,23/25] examples/l2fwd-crypto: replace strtok with reentrant version [v5,24/25] examples/vhost: replace strtok with reentrant version [v5,25/25] devtools: check for some reentrant function

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Jie Hai Nov. 8, 2024, 11:03 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 version.

Fixes: 5c59002a34f3 ("app/graph: add graph commands")
Fixes: 984a315a5804 ("app/graph: add parser utility")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/graph/graph.c |  6 ++++--
 app/graph/utils.c | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/app/graph/graph.c b/app/graph/graph.c
index 17717738d7d9..6849b8da5da4 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -13,6 +13,7 @@ 
 #include <rte_ethdev.h>
 #include <rte_graph_worker.h>
 #include <rte_log.h>
+#include <rte_os_shim.h>
 
 #include "graph_priv.h"
 #include "module_api.h"
@@ -103,9 +104,10 @@  parser_usecases_read(char *usecases)
 {
 	bool valid = false;
 	uint32_t i, j = 0;
+	char *sp = NULL;
 	char *token;
 
-	token = strtok(usecases, ",");
+	token = strtok_r(usecases, ",", &sp);
 	while (token != NULL) {
 		for (i = 0; i < RTE_DIM(supported_usecases); i++) {
 			if (strcmp(supported_usecases[i], token) == 0) {
@@ -116,7 +118,7 @@  parser_usecases_read(char *usecases)
 				break;
 			}
 		}
-		token = strtok(NULL, ",");
+		token = strtok_r(NULL, ",", &sp);
 	}
 
 	return valid;
diff --git a/app/graph/utils.c b/app/graph/utils.c
index 3e8099ea8821..6c53948aa277 100644
--- a/app/graph/utils.c
+++ b/app/graph/utils.c
@@ -10,6 +10,7 @@ 
 
 #include <rte_common.h>
 #include <rte_string_fns.h>
+#include <rte_os_shim.h>
 
 #include "module_api.h"
 
@@ -94,13 +95,14 @@  int
 parser_ip4_read(uint32_t *value, char *p)
 {
 	uint8_t shift = 24;
+	char *sp = NULL;
 	uint32_t ip = 0;
 	char *token;
 
-	token = strtok(p, ".");
+	token = strtok_r(p, ".", &sp);
 	while (token != NULL) {
 		ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
-		token = strtok(NULL, ".");
+		token = strtok_r(NULL, ".", &sp);
 		shift -= 8;
 	}
 
@@ -113,13 +115,14 @@  int
 parser_ip6_read(uint8_t *value, char *p)
 {
 	uint64_t val = 0;
+	char *sp = NULL;
 	char *token;
 
-	token = strtok(p, ":");
+	token = strtok_r(p, ":", &sp);
 	while (token != NULL) {
 		hex_string_to_uint64(&val, token);
 		*value = val;
-		token = strtok(NULL, ":");
+		token = strtok_r(NULL, ":", &sp);
 		value++;
 		val = 0;
 	}
@@ -132,13 +135,14 @@  parser_mac_read(uint64_t *value, char *p)
 {
 	uint64_t mac = 0, val = 0;
 	uint8_t shift = 40;
+	char *sp = NULL;
 	char *token;
 
-	token = strtok(p, ":");
+	token = strtok_r(p, ":", &sp);
 	while (token != NULL) {
 		hex_string_to_uint64(&val, token);
 		mac |= val << shift;
-		token = strtok(NULL, ":");
+		token = strtok_r(NULL, ":", &sp);
 		shift -= 8;
 		val = 0;
 	}