[v3,11/22] ethdev: replace strtok with reentrant version
Checks
Commit Message
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: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/ethdev/rte_ethdev_telemetry.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Comments
On 11/14/23 13:59, Jie Hai wrote:
> 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: stable@dpdk.org
>
> Signed-off-by: Jie Hai <haijie1@huawei.com>
> Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
@@ -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;