From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id D39F6430AB;
Mon, 13 Nov 2023 11:52:33 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D295940E8A;
Mon, 13 Nov 2023 11:51:13 +0100 (CET)
Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])
by mails.dpdk.org (Postfix) with ESMTP id F130340A75
for <dev@dpdk.org>; Mon, 13 Nov 2023 11:51:03 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.57])
by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4STR6c0spnzvQYL;
Mon, 13 Nov 2023 18:50:48 +0800 (CST)
Received: from localhost.localdomain (10.67.165.2) by
kwepemd100004.china.huawei.com (7.221.188.31) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.2.1258.23; Mon, 13 Nov 2023 18:51:02 +0800
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>
X-Mailer: git-send-email 2.30.0
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
X-Originating-IP: [10.67.165.2]
X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To
kwepemd100004.china.huawei.com (7.221.188.31)
X-CFilter-Loop: Reflected
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
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 --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)
--
2.30.0