diff mbox series

[v3,01/22] app/graph: replace strtok with reentrant version

Message ID	20231114110006.91148-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>, Sunil Kumar Kori <skori@marvell.com>, Rakesh Kudurumalla <rkudurumalla@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, Jerin Jacob <jerinj@marvell.com> CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com> Subject: [PATCH v3 01/22] app/graph: replace strtok with reentrant version Date: Tue, 14 Nov 2023 18:59:45 +0800 Message-ID: <20231114110006.91148-2-haijie1@huawei.com> In-Reply-To: <20231114110006.91148-1-haijie1@huawei.com> References: <20231113104550.2138654-1-haijie1@huawei.com> <20231114110006.91148-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 reentrant version \| [v3,00/22] replace strtok with reentrant version [v3,01/22] app/graph: replace strtok with reentrant version [v3,02/22] app/bbdev: replace strtok with reentrant version [v3,03/22] app/compress-perf: replace strtok with reentrant version [v3,04/22] app/crypto-perf: replace strtok with reentrant version [v3,05/22] app/dma-perf: replace strtok with reentrant version [v3,06/22] app/test-fib: replace strtok with reentrant version [v3,07/22] app/flow-perf: replace strtok with reentrant version [v3,08/22] app/test-mldev: replace strtok with reentrant version [v3,09/22] dmadev: replace strtok with reentrant version [v3,10/22] eal: replace strtok with reentrant version [v3,11/22] ethdev: replace strtok with reentrant version [v3,12/22] eventdev: replace strtok with reentrant version [v3,13/22] security: replace strtok with reentrant version [v3,14/22] telemetry: replace strtok with reentrant version [v3,15/22] bus/fslmc: replace strtok with reentrant version [v3,16/22] common/cnxk: replace strtok with reentrant version [v3,17/22] event/cnxk: replace strtok with reentrant version [v3,18/22] net/ark: replace strtok with reentrant version [v3,19/22] raw/cnxk_gpio: replace strtok with reentrant version [v3,20/22] examples/l2fwd-crypto: replace strtok with reentrant version [v3,21/22] examples/vhost: replace strtok with reentrant version [v3,22/22] devtools: check for some reentrant function

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Jie Hai Nov. 14, 2023, 10:59 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")
Cc: stable@dpdk.org

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

Comments

Stephen Hemminger Nov. 15, 2023, 12:07 a.m. UTC | #1

On Tue, 14 Nov 2023 18:59:45 +0800
Jie Hai <haijie1@huawei.com> wrote:

> 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")

NAK
These are only called from graph CLI which must be single threaded

diff mbox series

Patch

diff --git a/app/graph/graph.c b/app/graph/graph.c
index a65723a196da..316950948160 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -103,9 +103,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 +117,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 c7b6ae83cf1f..ae2ff225c394 100644
--- a/app/graph/utils.c
+++ b/app/graph/utils.c
@@ -101,13 +101,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;
 	}
 
@@ -120,13 +121,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;
 	}
@@ -139,13 +141,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;
 	}