diff mbox series

[18/21] net/ark: replace strtok with strtok_r

Message ID	20231113104550.2138654-19-haijie1@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, Shepard Siegel <shepard.siegel@atomicrules.com>, Ed Czeck <ed.czeck@atomicrules.com>, John Miller <john.miller@atomicrules.com> CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com> Subject: [PATCH 18/21] net/ark: replace strtok with strtok_r Date: Mon, 13 Nov 2023 18:45:47 +0800 Message-ID: <20231113104550.2138654-19-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>
---
 drivers/net/ark/ark_pktchkr.c | 10 +++++-----
 drivers/net/ark/ark_pktgen.c  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c
index e1f336c73c2a..6e8e5339607b 100644
--- a/drivers/net/ark/ark_pktchkr.c
+++ b/drivers/net/ark/ark_pktchkr.c
@@ -359,14 +359,14 @@  set_arg(char *arg, char *val)
 void
 ark_pktchkr_parse(char *args)
 {
-	char *argv, *v;
+	char *argv, *v, *sp = NULL;
 	const char toks[] = "=\n\t\v\f \r";
-	argv = strtok(args, toks);
-	v = strtok(NULL, toks);
+	argv = strtok_r(args, toks, &sp);
+	v = strtok_r(NULL, toks, &sp);
 	while (argv && v) {
 		set_arg(argv, v);
-		argv = strtok(NULL, toks);
-		v = strtok(NULL, toks);
+		argv = strtok_r(NULL, toks, &sp);
+		v = strtok_r(NULL, toks, &sp);
 	}
 }
 
diff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c
index 69ff7072b2ab..d611406a1b46 100644
--- a/drivers/net/ark/ark_pktgen.c
+++ b/drivers/net/ark/ark_pktgen.c
@@ -340,14 +340,14 @@  pmd_set_arg(char *arg, char *val)
 void
 ark_pktgen_parse(char *args)
 {
-	char *argv, *v;
+	char *argv, *v, *sp = NULL;
 	const char toks[] = " =\n\t\v\f \r";
-	argv = strtok(args, toks);
-	v = strtok(NULL, toks);
+	argv = strtok_r(args, toks, &sp);
+	v = strtok_r(NULL, toks, &sp);
 	while (argv && v) {
 		pmd_set_arg(argv, v);
-		argv = strtok(NULL, toks);
-		v = strtok(NULL, toks);
+		argv = strtok_r(NULL, toks, &sp);
+		v = strtok_r(NULL, toks, &sp);
 	}
 }