diff mbox series

[16/21] common/cnxk: replace strtok with strtok_r

Message ID	20231113104550.2138654-17-haijie1@huawei.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com> CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com> Subject: [PATCH 16/21] common/cnxk: replace strtok with strtok_r Date: Mon, 13 Nov 2023 18:45:45 +0800 Message-ID: <20231113104550.2138654-17-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/common/cnxk/cnxk_telemetry_nix.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/drivers/common/cnxk/cnxk_telemetry_nix.c b/drivers/common/cnxk/cnxk_telemetry_nix.c
index ccae5d7853af..8054c3cf910c 100644
--- a/drivers/common/cnxk/cnxk_telemetry_nix.c
+++ b/drivers/common/cnxk/cnxk_telemetry_nix.c
@@ -761,7 +761,7 @@  cnxk_nix_tel_handle_info_x(const char *cmd, const char *params,
 			   struct plt_tel_data *d)
 {
 	struct nix_tel_node *node;
-	char *name, *param;
+	char *name, *param, *sp = NULL;
 	char buf[1024];
 	int rc = -1;
 
@@ -769,11 +769,11 @@  cnxk_nix_tel_handle_info_x(const char *cmd, const char *params,
 		goto exit;
 
 	plt_strlcpy(buf, params, PCI_PRI_STR_SIZE + 1);
-	name = strtok(buf, ",");
+	name = strtok_r(buf, ",", &sp);
 	if (name == NULL)
 		goto exit;
 
-	param = strtok(NULL, "\0");
+	param = strtok_r(NULL, "\0", &sp);
 
 	node = nix_tel_node_get_by_pcidev_name(name);
 	if (!node)
@@ -782,7 +782,7 @@  cnxk_nix_tel_handle_info_x(const char *cmd, const char *params,
 	plt_tel_data_start_dict(d);
 
 	if (strstr(cmd, "rq")) {
-		char *tok = strtok(param, ",");
+		char *tok = strtok_r(param, ",", &sp);
 		int rq;
 
 		if (!tok)
@@ -798,7 +798,7 @@  cnxk_nix_tel_handle_info_x(const char *cmd, const char *params,
 			rc = cnxk_tel_nix_rq(node->rqs[rq], d);
 
 	} else if (strstr(cmd, "cq")) {
-		char *tok = strtok(param, ",");
+		char *tok = strtok_r(param, ",", &sp);
 		int cq;
 
 		if (!tok)
@@ -814,7 +814,7 @@  cnxk_nix_tel_handle_info_x(const char *cmd, const char *params,
 			rc = cnxk_tel_nix_cq(node->cqs[cq], d);
 
 	} else if (strstr(cmd, "sq")) {
-		char *tok = strtok(param, ",");
+		char *tok = strtok_r(param, ",", &sp);
 		int sq;
 
 		if (!tok)