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")
Cc: [email protected]
Signed-off-by: Jie Hai <[email protected]>
Acked-by: Chengwen Feng <[email protected]>
Reviewed-by: Andrew Rybchenko <[email protected]>
Acked-by: Morten Brørup <[email protected]>
---
lib/ethdev/rte_ethdev_telemetry.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/ethdev/rte_ethdev_telemetry.c
b/lib/ethdev/rte_ethdev_telemetry.c
index 5e6c4172d3be..0362b1b46d4a 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -477,6 +477,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 +490,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 +1222,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 +1512,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