From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Sunil Kumar Kori <skori@marvell.com>,
Rakesh Kudurumalla <rkudurumalla@marvell.com>
Subject: [PATCH] graph: replace strtok with strtok_r
Date: Wed, 11 Sep 2024 17:55:33 -0700 [thread overview]
Message-ID: <20240912005602.71815-1-stephen@networkplumber.org> (raw)
The function strtok is not thread safe, better to use strtok_r.
This patch was found by running semgrep on the DPDK repository.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/graph/graph.c | 6 +++---
app/graph/utils.c | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/graph/graph.c b/app/graph/graph.c
index 17717738d7..3af031cbaf 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -103,9 +103,9 @@ parser_usecases_read(char *usecases)
{
bool valid = false;
uint32_t i, j = 0;
- char *token;
+ char *token, *saveptr = NULL;
- token = strtok(usecases, ",");
+ token = strtok_r(usecases, ",", &saveptr);
while (token != NULL) {
for (i = 0; i < RTE_DIM(supported_usecases); i++) {
if (strcmp(supported_usecases[i], token) == 0) {
@@ -116,7 +116,7 @@ parser_usecases_read(char *usecases)
break;
}
}
- token = strtok(NULL, ",");
+ token = strtok_r(NULL, ",", &saveptr);
}
return valid;
diff --git a/app/graph/utils.c b/app/graph/utils.c
index 3e8099ea88..5b1f865dd8 100644
--- a/app/graph/utils.c
+++ b/app/graph/utils.c
@@ -95,12 +95,12 @@ parser_ip4_read(uint32_t *value, char *p)
{
uint8_t shift = 24;
uint32_t ip = 0;
- char *token;
+ char *token, *saveptr = NULL;
- token = strtok(p, ".");
+ token = strtok_r(p, ".", &saveptr);
while (token != NULL) {
ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
- token = strtok(NULL, ".");
+ token = strtok_r(NULL, ".", &saveptr);
shift -= 8;
}
@@ -113,13 +113,13 @@ int
parser_ip6_read(uint8_t *value, char *p)
{
uint64_t val = 0;
- char *token;
+ char *token, *saveptr = NULL;
- token = strtok(p, ":");
+ token = strtok_r(p, ":", &saveptr);
while (token != NULL) {
hex_string_to_uint64(&val, token);
*value = val;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &saveptr);
value++;
val = 0;
}
@@ -132,13 +132,13 @@ parser_mac_read(uint64_t *value, char *p)
{
uint64_t mac = 0, val = 0;
uint8_t shift = 40;
- char *token;
+ char *token, *saveptr = NULL;
- token = strtok(p, ":");
+ token = strtok_r(p, ":", &saveptr);
while (token != NULL) {
hex_string_to_uint64(&val, token);
mac |= val << shift;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &saveptr);
shift -= 8;
val = 0;
}
--
2.45.2
next reply other threads:[~2024-09-12 0:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 0:55 Stephen Hemminger [this message]
2024-09-12 1:29 ` fengchengwen
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=20240912005602.71815-1-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=rkudurumalla@marvell.com \
--cc=skori@marvell.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).