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 17C96430AB;
Mon, 13 Nov 2023 11:51:02 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 26B7A4067A;
Mon, 13 Nov 2023 11:50:54 +0100 (CET)
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189])
by mails.dpdk.org (Postfix) with ESMTP id 39AE74021F
for <dev@dpdk.org>; Mon, 13 Nov 2023 11:50:51 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.56])
by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4STR1M5PCwzMmpD
for <dev@dpdk.org>; Mon, 13 Nov 2023 18:46:15 +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>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH 03/21] app/test-compress-perf: replace strtok with strtok_r
Date: Mon, 13 Nov 2023 18:45:32 +0800
Message-ID: <20231113104550.2138654-4-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-compress-perf/comp_perf_options_parse.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/test-compress-perf/comp_perf_options_parse.c b/app/test-compress-perf/comp_perf_options_parse.c
index 6d8c370fc2ea..d997fa667a94 100644
--- a/app/test-compress-perf/comp_perf_options_parse.c
+++ b/app/test-compress-perf/comp_perf_options_parse.c
@@ -177,6 +177,7 @@ parse_range(const char *arg, uint8_t *min, uint8_t *max, uint8_t *inc)
{
char *token;
uint8_t number;
+ char *sp = NULL;
char *copy_arg = strdup(arg);
@@ -184,7 +185,7 @@ parse_range(const char *arg, uint8_t *min, uint8_t *max, uint8_t *inc)
return -1;
errno = 0;
- token = strtok(copy_arg, ":");
+ token = strtok_r(copy_arg, ":", &sp);
/* Parse minimum value */
if (token != NULL) {
@@ -197,7 +198,7 @@ parse_range(const char *arg, uint8_t *min, uint8_t *max, uint8_t *inc)
} else
goto err_range;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &sp);
/* Parse increment value */
if (token != NULL) {
@@ -211,7 +212,7 @@ parse_range(const char *arg, uint8_t *min, uint8_t *max, uint8_t *inc)
} else
goto err_range;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &sp);
/* Parse maximum value */
if (token != NULL) {
@@ -225,7 +226,7 @@ parse_range(const char *arg, uint8_t *min, uint8_t *max, uint8_t *inc)
} else
goto err_range;
- if (strtok(NULL, ":") != NULL)
+ if (strtok_r(NULL, ":", &sp) != NULL)
goto err_range;
free(copy_arg);
@@ -244,6 +245,7 @@ parse_list(const char *arg, uint8_t *list, uint8_t *min, uint8_t *max)
uint8_t count = 0;
uint32_t temp_min;
uint32_t temp_max;
+ char *sp = NULL;
char *copy_arg = strdup(arg);
@@ -251,7 +253,7 @@ parse_list(const char *arg, uint8_t *list, uint8_t *min, uint8_t *max)
return -1;
errno = 0;
- token = strtok(copy_arg, ",");
+ token = strtok_r(copy_arg, ",", &sp);
/* Parse first value */
if (token != NULL) {
@@ -266,7 +268,7 @@ parse_list(const char *arg, uint8_t *list, uint8_t *min, uint8_t *max)
} else
goto err_list;
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
while (token != NULL) {
if (count == MAX_LIST) {
@@ -288,7 +290,7 @@ parse_list(const char *arg, uint8_t *list, uint8_t *min, uint8_t *max)
if (number > temp_max)
temp_max = number;
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
}
if (min)
--
2.30.0