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 2FD41430AB;
Mon, 13 Nov 2023 11:51:16 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 7C85F40697;
Mon, 13 Nov 2023 11:50:56 +0100 (CET)
Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])
by mails.dpdk.org (Postfix) with ESMTP id 4B160402B7
for <dev@dpdk.org>; Mon, 13 Nov 2023 11:50:51 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.53])
by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4STR6M4x0QzvQYR
for <dev@dpdk.org>; Mon, 13 Nov 2023 18:50:35 +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:49 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Ciara Power <ciara.power@intel.com>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH 04/21] app/test-crypto-perf: replace strtok with strtok_r
Date: Mon, 13 Nov 2023 18:45:33 +0800
Message-ID: <20231113104550.2138654-5-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/test-crypto-perf/cperf_options_parsing.c | 16 +++++++++-------
app/test-crypto-perf/cperf_test_vector_parsing.c | 10 ++++++----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c
index 75afedc7fd6e..77cda0eb8e6f 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -161,6 +161,7 @@ parse_range(const char *arg, uint32_t *min, uint32_t *max, uint32_t *inc)
{
char *token;
uint32_t number;
+ char *sp = NULL;
char *copy_arg = strdup(arg);
@@ -168,7 +169,7 @@ parse_range(const char *arg, uint32_t *min, uint32_t *max, uint32_t *inc)
return -1;
errno = 0;
- token = strtok(copy_arg, ":");
+ token = strtok_r(copy_arg, ":", &sp);
/* Parse minimum value */
if (token != NULL) {
@@ -182,7 +183,7 @@ parse_range(const char *arg, uint32_t *min, uint32_t *max, uint32_t *inc)
} else
goto err_range;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &sp);
/* Parse increment value */
if (token != NULL) {
@@ -196,7 +197,7 @@ parse_range(const char *arg, uint32_t *min, uint32_t *max, uint32_t *inc)
} else
goto err_range;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &sp);
/* Parse maximum value */
if (token != NULL) {
@@ -211,7 +212,7 @@ parse_range(const char *arg, uint32_t *min, uint32_t *max, uint32_t *inc)
} else
goto err_range;
- if (strtok(NULL, ":") != NULL)
+ if (strtok_r(NULL, ":", &sp) != NULL)
goto err_range;
free(copy_arg);
@@ -230,6 +231,7 @@ parse_list(const char *arg, uint32_t *list, uint32_t *min, uint32_t *max)
uint8_t count = 0;
uint32_t temp_min;
uint32_t temp_max;
+ char *sp = NULL;
char *copy_arg = strdup(arg);
@@ -237,7 +239,7 @@ parse_list(const char *arg, uint32_t *list, uint32_t *min, uint32_t *max)
return -1;
errno = 0;
- token = strtok(copy_arg, ",");
+ token = strtok_r(copy_arg, ",", &sp);
/* Parse first value */
if (token != NULL) {
@@ -253,7 +255,7 @@ parse_list(const char *arg, uint32_t *list, uint32_t *min, uint32_t *max)
} else
goto err_list;
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
while (token != NULL) {
if (count == MAX_LIST) {
@@ -275,7 +277,7 @@ parse_list(const char *arg, uint32_t *list, uint32_t *min, uint32_t *max)
if (number > temp_max)
temp_max = number;
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
}
if (min)
diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c
index 737d61d4af6b..4d2e6053e745 100644
--- a/app/test-crypto-perf/cperf_test_vector_parsing.c
+++ b/app/test-crypto-perf/cperf_test_vector_parsing.c
@@ -220,8 +220,9 @@ parse_values(char *tokens, uint8_t **data, uint32_t *data_length)
uint8_t *values, *values_resized;
char *tok, *error = NULL;
+ char *sp = NULL;
- tok = strtok(tokens, CPERF_VALUE_DELIMITER);
+ tok = strtok_r(tokens, CPERF_VALUE_DELIMITER, &sp);
if (tok == NULL)
return -1;
@@ -252,7 +253,7 @@ parse_values(char *tokens, uint8_t **data, uint32_t *data_length)
return -1;
}
- tok = strtok(NULL, CPERF_VALUE_DELIMITER);
+ tok = strtok_r(NULL, CPERF_VALUE_DELIMITER, &sp);
if (tok == NULL)
break;
@@ -283,6 +284,7 @@ parse_entry(char *entry, struct cperf_test_vector *vector,
uint8_t *data = NULL;
char *token, *key_token;
+ char *sp = NULL;
if (entry == NULL) {
printf("Expected entry value\n");
@@ -290,10 +292,10 @@ parse_entry(char *entry, struct cperf_test_vector *vector,
}
/* get key */
- token = strtok(entry, CPERF_ENTRY_DELIMITER);
+ token = strtok_r(entry, CPERF_ENTRY_DELIMITER, &sp);
key_token = token;
/* get values for key */
- token = strtok(NULL, CPERF_ENTRY_DELIMITER);
+ token = strtok_r(NULL, CPERF_ENTRY_DELIMITER, &sp);
if (key_token == NULL || token == NULL) {
printf("Expected 'key = values' but was '%.40s'..\n", entry);
--
2.30.0