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 394B343325;
Tue, 14 Nov 2023 09:47:47 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 1FB9040A4B;
Tue, 14 Nov 2023 09:47:21 +0100 (CET)
Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])
by mails.dpdk.org (Postfix) with ESMTP id 16CE54027B
for <dev@dpdk.org>; Tue, 14 Nov 2023 09:47:14 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.56])
by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SV0K727JPzWh1N;
Tue, 14 Nov 2023 16:46:51 +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; Tue, 14 Nov 2023 16:47:12 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Cheng Jiang <honest.jiang@foxmail.com>, Anoob Joseph
<anoobj@marvell.com>, =?UTF-8?q?Morten=20Br=C3=B8rup?=
<mb@smartsharesystems.com>, Chengwen Feng <fengchengwen@huawei.com>, Chenbo
Xia <chenbox@nvidia.com>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>
Subject: [PATCH v2 05/22] app/dma-perf: replace strtok with reentrant version
Date: Tue, 14 Nov 2023 16:41:16 +0800
Message-ID: <20231114084133.3573959-6-haijie1@huawei.com>
X-Mailer: git-send-email 2.30.0
In-Reply-To: <20231114084133.3573959-1-haijie1@huawei.com>
References: <20231113104550.2138654-1-haijie1@huawei.com>
<20231114084133.3573959-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: dggems701-chm.china.huawei.com (10.3.19.178) 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 version.
Fixes: 623dc9364dc6 ("app/dma-perf: introduce DMA performance test")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-dma-perf/main.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/test-dma-perf/main.c b/app/test-dma-perf/main.c
index e5bccc27da5e..e34f9f8aaa7c 100644
--- a/app/test-dma-perf/main.c
+++ b/app/test-dma-perf/main.c
@@ -164,6 +164,7 @@ parse_lcore(struct test_configure *test_case, const char *value)
uint16_t len;
char *input;
struct lcore_dma_map_t *lcore_dma_map;
+ char *sp = NULL;
if (test_case == NULL || value == NULL)
return -1;
@@ -175,7 +176,7 @@ parse_lcore(struct test_configure *test_case, const char *value)
memset(lcore_dma_map, 0, sizeof(struct lcore_dma_map_t));
- char *token = strtok(input, ", ");
+ char *token = strtok_s(input, ", ", &sp);
while (token != NULL) {
if (lcore_dma_map->cnt >= MAX_LCORE_NB) {
free(input);
@@ -185,7 +186,7 @@ parse_lcore(struct test_configure *test_case, const char *value)
uint16_t lcore_id = atoi(token);
lcore_dma_map->lcores[lcore_dma_map->cnt++] = lcore_id;
- token = strtok(NULL, ", ");
+ token = strtok_s(NULL, ", ", &sp);
}
free(input);
@@ -201,6 +202,7 @@ parse_lcore_dma(struct test_configure *test_case, const char *value)
char *start, *end, *substr;
uint16_t lcore_id;
int ret = 0;
+ char *sp = NULL;
if (test_case == NULL || value == NULL)
return -1;
@@ -216,7 +218,7 @@ parse_lcore_dma(struct test_configure *test_case, const char *value)
goto out;
}
- substr = strtok(addrs, ",");
+ substr = strtok_s(addrs, ",", &sp);
if (substr == NULL) {
fprintf(stderr, "No input DMA address\n");
ret = -1;
@@ -258,7 +260,7 @@ parse_lcore_dma(struct test_configure *test_case, const char *value)
strlcpy(lcore_dma_map->dma_names[lcore_dma_map->cnt], ptrs[1],
RTE_DEV_NAME_MAX_LEN);
lcore_dma_map->cnt++;
- substr = strtok(NULL, ",");
+ substr = strtok_s(NULL, ",", &sp);
} while (substr != NULL);
out:
@@ -486,6 +488,7 @@ main(int argc, char *argv[])
char *rst_path_ptr = NULL;
char rst_path[PATH_MAX];
int new_argc;
+ char *sp = NULL;
memset(args, 0, sizeof(args));
@@ -504,7 +507,7 @@ main(int argc, char *argv[])
}
if (rst_path_ptr == NULL) {
strlcpy(rst_path, cfg_path_ptr, PATH_MAX);
- char *token = strtok(basename(rst_path), ".");
+ char *token = strtok_s(basename(rst_path), ".", &sp);
if (token == NULL) {
printf("Config file error.\n");
return -1;
--
2.30.0