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 CFD65430AB;
Mon, 13 Nov 2023 11:50:56 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id F386C402F1;
Mon, 13 Nov 2023 11:50:52 +0100 (CET)
Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])
by mails.dpdk.org (Postfix) with ESMTP id A9B414021F
for <dev@dpdk.org>; Mon, 13 Nov 2023 11:50:50 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.55])
by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4STR6L0w6zzvQYF;
Mon, 13 Nov 2023 18:50:34 +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:50:48 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Sunil Kumar Kori <skori@marvell.com>, Rakesh Kudurumalla
<rkudurumalla@marvell.com>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH 01/21] app/graph: replace strtok with strtok_r
Date: Mon, 13 Nov 2023 18:45:30 +0800
Message-ID: <20231113104550.2138654-2-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>
---
app/graph/graph.c | 5 +++--
app/graph/utils.c | 15 +++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
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;
}
--
2.30.0