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 5437F43325;
Tue, 14 Nov 2023 09:47:52 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 5B92A40698;
Tue, 14 Nov 2023 09:47:22 +0100 (CET)
Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])
by mails.dpdk.org (Postfix) with ESMTP id 100BC402EF
for <dev@dpdk.org>; Tue, 14 Nov 2023 09:47:15 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.57])
by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SV0K837ZDzWhBR;
Tue, 14 Nov 2023 16:46:52 +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:13 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Wisam Jaddo <wisamm@nvidia.com>, Alexander Kozyrev
<akozyrev@nvidia.com>, Rongwei Liu <rongweil@nvidia.com>, Haifei Luo
<haifeil@nvidia.com>, Jiawei Wang <jiaweiw@nvidia.com>, Sean Zhang
<xiazhang@nvidia.com>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH v2 07/22] app/flow-perf: replace strtok with reentrant version
Date: Tue, 14 Nov 2023 16:41:18 +0800
Message-ID: <20231114084133.3573959-8-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: 0c8f1f4ab90e ("app/flow-perf: support raw encap/decap actions")
Fixes: 7f37f0936a19 ("app/flow-perf: support meter policy API")
Fixes: 80a323319745 ("app/flow-perf: add destination ports parameter")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-flow-perf/main.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index e224ef67983d..04ce7e38a539 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -602,6 +602,7 @@ read_meter_policy(char *prog, char *arg)
{
char *token;
size_t i, j, k;
+ char *sp = NULL;
j = 0;
k = 0;
@@ -612,9 +613,9 @@ read_meter_policy(char *prog, char *arg)
token = strsep(&arg, ":\0");
}
j = 0;
- token = strtok(actions_str[0], ",\0");
+ token = strtok_s(actions_str[0], ",\0", &sp);
while (token == NULL && j < RTE_COLORS - 1)
- token = strtok(actions_str[++j], ",\0");
+ token = strtok_s(actions_str[++j], ",\0", &sp);
while (j < RTE_COLORS && token != NULL) {
for (i = 0; i < RTE_DIM(flow_options); i++) {
if (!strcmp(token, flow_options[i].str)) {
@@ -628,9 +629,9 @@ read_meter_policy(char *prog, char *arg)
usage(prog);
rte_exit(EXIT_SUCCESS, "Invalid colored actions\n");
}
- token = strtok(NULL, ",\0");
+ token = strtok_s(NULL, ",\0", &sp);
while (!token && j < RTE_COLORS - 1) {
- token = strtok(actions_str[++j], ",\0");
+ token = strtok_s(actions_str[++j], ",\0", &sp);
k = 0;
}
}
@@ -641,6 +642,7 @@ args_parse(int argc, char **argv)
{
uint64_t pm, seed;
uint64_t hp_conf;
+ char *sp = NULL;
char **argvopt;
uint32_t prio;
char *token;
@@ -804,7 +806,7 @@ args_parse(int argc, char **argv)
RTE_FLOW_ACTION_TYPE_RAW_ENCAP
);
- token = strtok(optarg, ",");
+ token = strtok_s(optarg, ",", &sp);
while (token != NULL) {
for (i = 0; i < RTE_DIM(flow_options); i++) {
if (strcmp(flow_options[i].str, token) == 0) {
@@ -817,7 +819,7 @@ args_parse(int argc, char **argv)
rte_exit(EXIT_FAILURE,
"Invalid encap item: %s\n", token);
}
- token = strtok(NULL, ",");
+ token = strtok_s(NULL, ",", &sp);
}
printf(" / ");
}
@@ -828,7 +830,7 @@ args_parse(int argc, char **argv)
RTE_FLOW_ACTION_TYPE_RAW_DECAP
);
- token = strtok(optarg, ",");
+ token = strtok_s(optarg, ",", &sp);
while (token != NULL) {
for (i = 0; i < RTE_DIM(flow_options); i++) {
if (strcmp(flow_options[i].str, token) == 0) {
@@ -841,7 +843,7 @@ args_parse(int argc, char **argv)
rte_exit(EXIT_FAILURE,
"Invalid decap item %s\n", token);
}
- token = strtok(NULL, ",");
+ token = strtok_s(NULL, ",", &sp);
}
printf(" / ");
}
@@ -910,10 +912,10 @@ args_parse(int argc, char **argv)
uint16_t port_idx = 0;
char *token;
- token = strtok(optarg, ",");
+ token = strtok_s(optarg, ",", &sp);
while (token != NULL) {
dst_ports[port_idx++] = atoi(token);
- token = strtok(NULL, ",");
+ token = strtok_s(NULL, ",", &sp);
}
}
if (strcmp(lgopts[opt_idx].name, "rxq") == 0) {
--
2.30.0