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 B201145CA6;
Fri, 8 Nov 2024 12:17:49 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id B9F36433A6;
Fri, 8 Nov 2024 12:16:06 +0100 (CET)
Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32])
by mails.dpdk.org (Postfix) with ESMTP id B192C4337D
for <dev@dpdk.org>; Fri, 8 Nov 2024 12:15:51 +0100 (CET)
Received: from mail.maildlp.com (unknown [172.19.162.112])
by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4XlGZz3FV2z1yp8b;
Fri, 8 Nov 2024 19:15:55 +0800 (CST)
Received: from kwepemf500004.china.huawei.com (unknown [7.202.181.242])
by mail.maildlp.com (Postfix) with ESMTPS id E731714022E;
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:44 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Andrew
Rybchenko <andrew.rybchenko@oktetlabs.ru>
CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <haijie1@huawei.com>,
<huangdengdui@huawei.com>
Subject: [PATCH v5 11/25] ethdev: replace strtok with reentrant version
Date: Fri, 8 Nov 2024 19:03:50 +0800
Message-ID: <20241108110404.18317-12-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: f38f62650f7b ("ethdev: add Rx queue telemetry query")
Fixes: 9e7533aeb80a ("ethdev: add telemetry command for TM level capabilities")
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/ethdev/rte_ethdev_telemetry.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
index 5e6c4172d3be..e589032dd368 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -7,6 +7,7 @@
#include <rte_kvargs.h>
#include <rte_telemetry.h>
+#include <rte_os_shim.h>
#include "rte_ethdev.h"
#include "ethdev_driver.h"
@@ -477,6 +478,7 @@ ethdev_parse_queue_params(const char *params, bool is_rx,
const char *qid_param;
uint16_t nb_queues;
char *end_param;
+ char *sp = NULL;
uint64_t qid;
int ret;
@@ -489,7 +491,7 @@ ethdev_parse_queue_params(const char *params, bool is_rx,
if (nb_queues == 1 && *end_param == '\0')
qid = 0;
else {
- qid_param = strtok(end_param, ",");
+ qid_param = strtok_r(end_param, ",", &sp);
if (!qid_param || strlen(qid_param) == 0 || !isdigit(*qid_param))
return -EINVAL;
@@ -1221,9 +1223,10 @@ static int
eth_dev_parse_tm_params(char *params, uint32_t *result)
{
const char *splited_param;
+ char *sp = NULL;
uint64_t ret;
- splited_param = strtok(params, ",");
+ splited_param = strtok_r(params, ",", &sp);
if (!splited_param || strlen(splited_param) == 0 || !isdigit(*splited_param))
return -EINVAL;
@@ -1510,13 +1513,14 @@ eth_dev_handle_port_regs(const char *cmd __rte_unused,
{
char *filter, *end_param;
uint16_t port_id;
+ char *sp = NULL;
int ret;
ret = eth_dev_parse_port_params(params, &port_id, &end_param, true);
if (ret != 0)
return ret;
- filter = strtok(end_param, ",");
+ filter = strtok_r(end_param, ",", &sp);
if (filter != NULL && strlen(filter) == 0)
filter = NULL;
--
2.22.0