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: 5c59002a34f3 ("app/graph: add graph commands")
Fixes: 984a315a5804 ("app/graph: add parser utility")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/graph/graph.c | 5 +++--
app/graph/utils.c | 15 +++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
@@ -103,9 +103,10 @@ parser_usecases_read(char *usecases)
{
bool valid = false;
uint32_t i, j = 0;
+ char *sp = NULL;
char *token;
- token = strtok(usecases, ",");
+ token = strtok_s(usecases, ",", &sp);
while (token != NULL) {
for (i = 0; i < RTE_DIM(supported_usecases); i++) {
if (strcmp(supported_usecases[i], token) == 0) {
@@ -116,7 +117,7 @@ parser_usecases_read(char *usecases)
break;
}
}
- token = strtok(NULL, ",");
+ token = strtok_s(NULL, ",", &sp);
}
return valid;
@@ -101,13 +101,14 @@ int
parser_ip4_read(uint32_t *value, char *p)
{
uint8_t shift = 24;
+ char *sp = NULL;
uint32_t ip = 0;
char *token;
- token = strtok(p, ".");
+ token = strtok_s(p, ".", &sp);
while (token != NULL) {
ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
- token = strtok(NULL, ".");
+ token = strtok_s(NULL, ".", &sp);
shift -= 8;
}
@@ -120,13 +121,14 @@ int
parser_ip6_read(uint8_t *value, char *p)
{
uint64_t val = 0;
+ char *sp = NULL;
char *token;
- token = strtok(p, ":");
+ token = strtok_s(p, ":", &sp);
while (token != NULL) {
hex_string_to_uint64(&val, token);
*value = val;
- token = strtok(NULL, ":");
+ token = strtok_s(NULL, ":", &sp);
value++;
val = 0;
}
@@ -139,13 +141,14 @@ parser_mac_read(uint64_t *value, char *p)
{
uint64_t mac = 0, val = 0;
uint8_t shift = 40;
+ char *sp = NULL;
char *token;
- token = strtok(p, ":");
+ token = strtok_s(p, ":", &sp);
while (token != NULL) {
hex_string_to_uint64(&val, token);
mac |= val << shift;
- token = strtok(NULL, ":");
+ token = strtok_s(NULL, ":", &sp);
shift -= 8;
val = 0;
}