From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Naga Harish K S V <s.v.naga.harish.k@intel.com>,
Jerin Jacob <jerinj@marvell.com>
Cc: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH v3 12/22] eventdev: replace strtok with reentrant version
Date: Tue, 14 Nov 2023 18:59:56 +0800 [thread overview]
Message-ID: <20231114110006.91148-13-haijie1@huawei.com> (raw)
In-Reply-To: <20231114110006.91148-1-haijie1@huawei.com>
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.
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/eventdev/rte_event_eth_rx_adapter.c | 38 ++++++++++++-------------
lib/eventdev/rte_eventdev.c | 18 ++++++------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index 6db03adf0463..4107d600dfb7 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3651,7 +3651,7 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
uint8_t rx_adapter_id;
uint16_t rx_queue_id;
int eth_dev_id, ret = -1;
- char *token, *l_params;
+ char *token, *l_params, *sp;
struct rte_event_eth_rx_adapter_queue_conf queue_conf;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
@@ -3661,19 +3661,19 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
l_params = strdup(params);
if (l_params == NULL)
return -ENOMEM;
- token = strtok(l_params, ",");
+ token = strtok_r(l_params, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
rx_adapter_id = strtoul(token, NULL, 10);
RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_GOTO_ERR_RET(rx_adapter_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get Rx queue ID from parameter string */
@@ -3684,7 +3684,7 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
goto error;
}
- token = strtok(NULL, "\0");
+ token = strtok_r(NULL, "\0", &sp);
if (token != NULL)
RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
" telemetry command, ignoring");
@@ -3723,7 +3723,7 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
uint8_t rx_adapter_id;
uint16_t rx_queue_id;
int eth_dev_id, ret = -1;
- char *token, *l_params;
+ char *token, *l_params, *sp = NULL;
struct rte_event_eth_rx_adapter_queue_stats q_stats;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
@@ -3733,19 +3733,19 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
l_params = strdup(params);
if (l_params == NULL)
return -ENOMEM;
- token = strtok(l_params, ",");
+ token = strtok_r(l_params, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
rx_adapter_id = strtoul(token, NULL, 10);
RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_GOTO_ERR_RET(rx_adapter_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get Rx queue ID from parameter string */
@@ -3756,7 +3756,7 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
goto error;
}
- token = strtok(NULL, "\0");
+ token = strtok_r(NULL, "\0", &sp);
if (token != NULL)
RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
" telemetry command, ignoring");
@@ -3794,7 +3794,7 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
uint8_t rx_adapter_id;
uint16_t rx_queue_id;
int eth_dev_id, ret = -1;
- char *token, *l_params;
+ char *token, *l_params, *sp = NULL;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
@@ -3803,19 +3803,19 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
l_params = strdup(params);
if (l_params == NULL)
return -ENOMEM;
- token = strtok(l_params, ",");
+ token = strtok_r(l_params, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
rx_adapter_id = strtoul(token, NULL, 10);
RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_GOTO_ERR_RET(rx_adapter_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get Rx queue ID from parameter string */
@@ -3826,7 +3826,7 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
goto error;
}
- token = strtok(NULL, "\0");
+ token = strtok_r(NULL, "\0", &sp);
if (token != NULL)
RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
" telemetry command, ignoring");
@@ -3855,7 +3855,7 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
uint8_t instance_id;
uint16_t rx_queue_id;
int eth_dev_id, ret = -1;
- char *token, *l_params;
+ char *token, *l_params, *sp = NULL;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
@@ -3863,14 +3863,14 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
l_params = strdup(params);
if (l_params == NULL)
return -ENOMEM;
- token = strtok(l_params, ",");
+ token = strtok_r(l_params, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &sp);
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
/* Get Rx queue ID from parameter string */
@@ -3881,7 +3881,7 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
goto error;
}
- token = strtok(NULL, "\0");
+ token = strtok_r(NULL, "\0", &sp);
if (token != NULL)
RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
" telemetry command, ignoring");
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 0ca32d672175..fabba0228672 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -1784,7 +1784,7 @@ handle_queue_links(const char *cmd __rte_unused,
struct rte_tel_data *d)
{
int i, ret, port_id = 0;
- char *end_param;
+ char *end_param, *sp = NULL;
uint8_t dev_id;
uint8_t queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
uint8_t priorities[RTE_EVENT_MAX_QUEUES_PER_DEV];
@@ -1797,12 +1797,12 @@ handle_queue_links(const char *cmd __rte_unused,
dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
+ p_param = strtok_r(end_param, ",", &sp);
if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
return -1;
port_id = strtoul(p_param, &end_param, 10);
- p_param = strtok(NULL, "\0");
+ p_param = strtok_r(NULL, "\0", &sp);
if (p_param != NULL)
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
@@ -1922,7 +1922,7 @@ handle_port_xstats(const char *cmd __rte_unused,
int dev_id;
int port_queue_id = 0;
enum rte_event_dev_xstats_mode mode;
- char *end_param;
+ char *end_param, *sp = NULL;
const char *p_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
@@ -1932,7 +1932,7 @@ handle_port_xstats(const char *cmd __rte_unused,
dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
+ p_param = strtok_r(end_param, ",", &sp);
mode = RTE_EVENT_DEV_XSTATS_PORT;
if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
@@ -1940,7 +1940,7 @@ handle_port_xstats(const char *cmd __rte_unused,
port_queue_id = strtoul(p_param, &end_param, 10);
- p_param = strtok(NULL, "\0");
+ p_param = strtok_r(NULL, "\0", &sp);
if (p_param != NULL)
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
@@ -1956,7 +1956,7 @@ handle_queue_xstats(const char *cmd __rte_unused,
int dev_id;
int port_queue_id = 0;
enum rte_event_dev_xstats_mode mode;
- char *end_param;
+ char *end_param, *sp = NULL;
const char *p_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
@@ -1966,7 +1966,7 @@ handle_queue_xstats(const char *cmd __rte_unused,
dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
+ p_param = strtok_r(end_param, ",", &sp);
mode = RTE_EVENT_DEV_XSTATS_QUEUE;
if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
@@ -1974,7 +1974,7 @@ handle_queue_xstats(const char *cmd __rte_unused,
port_queue_id = strtoul(p_param, &end_param, 10);
- p_param = strtok(NULL, "\0");
+ p_param = strtok_r(NULL, "\0", &sp);
if (p_param != NULL)
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
--
2.30.0
next prev parent reply other threads:[~2023-11-14 11:11 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 10:45 [PATCH 00/21] replace strtok with strtok_r Jie Hai
2023-11-13 10:45 ` [PATCH 01/21] app/graph: " Jie Hai
2023-11-13 10:45 ` [PATCH 02/21] app/test-bbdev: " Jie Hai
2023-11-13 10:45 ` [PATCH 03/21] app/test-compress-perf: " Jie Hai
2023-11-13 10:45 ` [PATCH 04/21] app/test-crypto-perf: " Jie Hai
2023-11-13 10:45 ` [PATCH 05/21] app/test-dma-perf: " Jie Hai
2023-11-13 10:45 ` [PATCH 06/21] app/test-fib: " Jie Hai
2023-11-13 10:45 ` [PATCH 07/21] app/dpdk-test-flow-perf: " Jie Hai
2023-11-13 10:45 ` [PATCH 08/21] app/test-mldev: " Jie Hai
2023-11-13 10:45 ` [PATCH 09/21] lib/dmadev: " Jie Hai
2023-11-13 10:45 ` [PATCH 10/21] lib/eal: " Jie Hai
2023-11-13 16:27 ` Stephen Hemminger
2023-11-14 1:05 ` fengchengwen
2023-11-14 1:08 ` Stephen Hemminger
2023-11-13 10:45 ` [PATCH 11/21] lib/ethdev: " Jie Hai
2023-11-13 10:45 ` [PATCH 12/21] lib/eventdev: " Jie Hai
2023-11-13 10:45 ` [PATCH 13/21] lib/telemetry: " Jie Hai
2023-11-13 10:45 ` [PATCH 14/21] " Jie Hai
2023-11-13 10:45 ` [PATCH 15/21] bus/fslmc: " Jie Hai
2023-11-15 2:41 ` Sachin Saxena
2023-11-13 10:45 ` [PATCH 16/21] common/cnxk: " Jie Hai
2023-11-13 10:45 ` [PATCH 17/21] event/cnxk: " Jie Hai
2023-11-13 10:45 ` [PATCH 18/21] net/ark: " Jie Hai
2023-11-13 10:45 ` [PATCH 19/21] raw/cnxk_gpio: " Jie Hai
2023-11-13 10:45 ` [PATCH 20/21] examples/l2fwd-crypto: " Jie Hai
2023-11-13 10:45 ` [PATCH 21/21] examples/vhost: " Jie Hai
2023-11-13 16:26 ` Stephen Hemminger
2023-11-13 11:00 ` [PATCH 00/21] " Thomas Monjalon
2023-11-13 11:33 ` fengchengwen
2023-11-13 16:25 ` Stephen Hemminger
2023-11-13 17:09 ` Tyler Retzlaff
2023-11-14 12:50 ` Jie Hai
2023-11-14 17:32 ` Tyler Retzlaff
2023-11-14 17:34 ` Tyler Retzlaff
2023-11-14 17:49 ` Tyler Retzlaff
2023-11-15 3:02 ` fengchengwen
2023-11-15 11:27 ` Morten Brørup
2023-11-15 15:08 ` Stephen Hemminger
2023-11-21 3:32 ` Jie Hai
2024-02-01 11:13 ` David Marchand
2023-11-14 8:41 ` [PATCH v2 00/22] replace strtok with reentrant version Jie Hai
2023-11-14 8:41 ` [PATCH v2 01/22] app/graph: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 02/22] app/bbdev: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 03/22] app/compress-perf: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 04/22] app/crypto-perf: " Jie Hai
2024-01-11 17:10 ` Power, Ciara
2023-11-14 8:41 ` [PATCH v2 05/22] app/dma-perf: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 06/22] app/test-fib: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 07/22] app/flow-perf: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 08/22] app/test-mldev: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 09/22] dmadev: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 10/22] eal: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 11/22] ethdev: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 12/22] eventdev: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 13/22] security: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 14/22] telemetry: " Jie Hai
2024-01-11 17:13 ` Power, Ciara
2023-11-14 8:41 ` [PATCH v2 15/22] bus/fslmc: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 16/22] common/cnxk: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 17/22] event/cnxk: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 18/22] net/ark: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 19/22] raw/cnxk_gpio: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 20/22] examples/l2fwd-crypto: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 21/22] examples/vhost: " Jie Hai
2023-11-14 8:41 ` [PATCH v2 22/22] devtools: check for some reentrant function Jie Hai
2023-11-14 10:59 ` [PATCH v3 00/22] replace strtok with reentrant version Jie Hai
2023-11-14 10:59 ` [PATCH v3 01/22] app/graph: " Jie Hai
2023-11-15 0:07 ` Stephen Hemminger
2023-11-14 10:59 ` [PATCH v3 02/22] app/bbdev: " Jie Hai
2023-11-15 0:09 ` Stephen Hemminger
2023-11-14 10:59 ` [PATCH v3 03/22] app/compress-perf: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 04/22] app/crypto-perf: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 05/22] app/dma-perf: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 06/22] app/test-fib: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 07/22] app/flow-perf: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 08/22] app/test-mldev: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 09/22] dmadev: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 10/22] eal: " Jie Hai
2023-11-15 7:17 ` [EXT] " Amit Prakash Shukla
2023-11-14 10:59 ` [PATCH v3 11/22] ethdev: " Jie Hai
2023-12-16 10:01 ` Andrew Rybchenko
2023-11-14 10:59 ` Jie Hai [this message]
2023-11-14 10:59 ` [PATCH v3 13/22] security: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 14/22] telemetry: " Jie Hai
2023-11-14 10:59 ` [PATCH v3 15/22] bus/fslmc: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 16/22] common/cnxk: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 17/22] event/cnxk: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 18/22] net/ark: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 19/22] raw/cnxk_gpio: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 20/22] examples/l2fwd-crypto: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 21/22] examples/vhost: " Jie Hai
2023-11-14 11:00 ` [PATCH v3 22/22] devtools: check for some reentrant function Jie Hai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114110006.91148-13-haijie1@huawei.com \
--to=haijie1@huawei.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=jerinj@marvell.com \
--cc=lihuisong@huawei.com \
--cc=s.v.naga.harish.k@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).