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 4316045CA6;
Fri, 8 Nov 2024 12:16:46 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D3DF843387;
Fri, 8 Nov 2024 12:15:53 +0100 (CET)
Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35])
by mails.dpdk.org (Postfix) with ESMTP id 9AE5143362
for <dev@dpdk.org>; Fri, 8 Nov 2024 12:15:45 +0100 (CET)
Received: from mail.maildlp.com (unknown [172.19.88.234])
by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4XlGXm12LPz1SGHP;
Fri, 8 Nov 2024 19:14:00 +0800 (CST)
Received: from kwepemf500004.china.huawei.com (unknown [7.202.181.242])
by mail.maildlp.com (Postfix) with ESMTPS id 5D567140120;
Fri, 8 Nov 2024 19:15:44 +0800 (CST)
Received: from localhost.localdomain (10.28.79.22) by
kwepemf500004.china.huawei.com (7.202.181.242) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1544.11; Fri, 8 Nov 2024 19:15:43 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Anatoly
Burakov <anatoly.burakov@intel.com>, Tyler Retzlaff
<roretzla@linux.microsoft.com>, Amit Prakash Shukla
<amitprakashs@marvell.com>
CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <haijie1@huawei.com>,
<huangdengdui@huawei.com>
Subject: [PATCH v5 10/25] eal: replace strtok with reentrant version
Date: Fri, 8 Nov 2024 19:03:49 +0800
Message-ID: <20241108110404.18317-11-haijie1@huawei.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20241108110404.18317-1-haijie1@huawei.com>
References: <20231113104550.2138654-1-haijie1@huawei.com>
<20241108110404.18317-1-haijie1@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-Originating-IP: [10.28.79.22]
X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To
kwepemf500004.china.huawei.com (7.202.181.242)
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: 2054f31a1fcd ("mem: add memseg info in telemetry")
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Amit Prakash Shukla <amitprakashs@marvell.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/eal/common/eal_common_memory.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index a185e0b580c7..ace63313ea75 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -1275,22 +1275,22 @@ parse_params(const char *params, uint32_t *vals, size_t n_vals)
char dlim[2] = ",";
char *params_args;
size_t count = 0;
- char *token;
+ char *token, *sp = NULL;
if (vals == NULL || params == NULL || strlen(params) == 0)
return -1;
- /* strtok expects char * and param is const char *. Hence on using
+ /* strtok_r expects char * and param is const char *. Hence on using
* params as "const char *" compiler throws warning.
*/
params_args = strdup(params);
if (params_args == NULL)
return -1;
- token = strtok(params_args, dlim);
+ token = strtok_r(params_args, dlim, &sp);
while (token && isdigit(*token) && count < n_vals) {
vals[count++] = strtoul(token, NULL, 10);
- token = strtok(NULL, dlim);
+ token = strtok_r(NULL, dlim, &sp);
}
free(params_args);
--
2.22.0