diff mbox series

[11/21] lib/ethdev: replace strtok with strtok_r

Message ID	20231113104550.2138654-12-haijie1@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, Thomas Monjalon <thomas@monjalon.net>, Ferruh Yigit <ferruh.yigit@amd.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com> Subject: [PATCH 11/21] lib/ethdev: replace strtok with strtok_r Date: Mon, 13 Nov 2023 18:45:40 +0800 Message-ID: <20231113104550.2138654-12-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>
---
 lib/ethdev/rte_ethdev_telemetry.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
index b01028ce9b60..6810c54109a5 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -477,6 +477,7 @@  ethdev_parse_queue_params(const char *params, bool is_rx,
 	const char *qid_param;
 	uint16_t nb_queues;
 	char *end_param;
+	char *sp = NULL;
 	uint64_t qid;
 	int ret;
 
@@ -489,7 +490,7 @@  ethdev_parse_queue_params(const char *params, bool is_rx,
 	if (nb_queues == 1 && *end_param == '\0')
 		qid = 0;
 	else {
-		qid_param = strtok(end_param, ",");
+		qid_param = strtok_r(end_param, ",", &sp);
 		if (!qid_param || strlen(qid_param) == 0 || !isdigit(*qid_param))
 			return -EINVAL;
 
@@ -1221,9 +1222,10 @@  static int
 eth_dev_parse_tm_params(char *params, uint32_t *result)
 {
 	const char *splited_param;
+	char *sp = NULL;
 	uint64_t ret;
 
-	splited_param = strtok(params, ",");
+	splited_param = strtok_r(params, ",", &sp);
 	if (!splited_param || strlen(splited_param) == 0 || !isdigit(*splited_param))
 		return -EINVAL;