From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
stable@dpdk.org, Jerin Jacob <jerinj@marvell.com>,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH 5/8] eventdev: remove strtok from telemetry handlers
Date: Fri, 5 Jun 2026 13:51:02 -0700 [thread overview]
Message-ID: <20260605205253.520196-6-stephen@networkplumber.org> (raw)
In-Reply-To: <20260605205253.520196-1-stephen@networkplumber.org>
The eventdev telemetry command handlers parsed parameters with strtok()
which is not thread safe. The code also has silent truncation
issues since it assigns result of strtoul() to smaller types.
Introduce common helper that checks parameter string
and gets a device id. Make sure and range check values
to the appropriate upper bound for that parameter.
Fixes: feaea0573429 ("eventdev: add device info telemetry command")
Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/eventdev/rte_eventdev.c | 136 +++++++++++++++++-------------------
1 file changed, 64 insertions(+), 72 deletions(-)
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 572cd5bd7d..a6f6b6879e 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -1790,6 +1790,34 @@ handle_dev_list(const char *cmd __rte_unused,
return 0;
}
+/* Get dev ID from parameter string */
+static int
+parse_dev_id(const char *params, uint8_t *dev_id, char **next_param)
+{
+ char *end_param;
+ unsigned long id;
+
+ if (params == NULL || *params == '\0' ||
+ !isdigit((unsigned char)*params))
+ return -1;
+
+ id = strtoul(params, &end_param, 10);
+ if (next_param != NULL) {
+ *next_param = end_param;
+ } else if (*end_param != '\0') {
+ RTE_EDEV_LOG_DEBUG(
+ "Extra parameters passed to eventdev telemetry command, ignoring");
+ }
+
+ if (id >= RTE_EVENT_MAX_DEVS) {
+ RTE_EDEV_LOG_DEBUG(
+ "Invalid device id out of range %lu", id);
+ return -1;
+ }
+ *dev_id = id;
+ return 0;
+}
+
static int
handle_dev_info(const char *cmd __rte_unused,
const char *params,
@@ -1797,16 +1825,10 @@ handle_dev_info(const char *cmd __rte_unused,
{
uint8_t dev_id;
struct rte_eventdev *dev;
- char *end_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, NULL) < 0)
return -1;
- dev_id = strtoul(params, &end_param, 10);
- if (*end_param != '\0')
- RTE_EDEV_LOG_DEBUG(
- "Extra parameters passed to eventdev telemetry command, ignoring");
-
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
@@ -1833,16 +1855,10 @@ handle_port_list(const char *cmd __rte_unused,
int i;
uint8_t dev_id;
struct rte_eventdev *dev;
- char *end_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, NULL) < 0)
return -1;
- dev_id = strtoul(params, &end_param, 10);
- if (*end_param != '\0')
- RTE_EDEV_LOG_DEBUG(
- "Extra parameters passed to eventdev telemetry command, ignoring");
-
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
@@ -1861,16 +1877,10 @@ handle_queue_list(const char *cmd __rte_unused,
int i;
uint8_t dev_id;
struct rte_eventdev *dev;
- char *end_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, NULL) != 0)
return -1;
- dev_id = strtoul(params, &end_param, 10);
- if (*end_param != '\0')
- RTE_EDEV_LOG_DEBUG(
- "Extra parameters passed to eventdev telemetry command, ignoring");
-
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
@@ -1886,27 +1896,28 @@ handle_queue_links(const char *cmd __rte_unused,
const char *params,
struct rte_tel_data *d)
{
- int i, ret, port_id = 0;
+ int i, ret;
char *end_param;
uint8_t dev_id;
uint8_t queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
uint8_t priorities[RTE_EVENT_MAX_QUEUES_PER_DEV];
- const char *p_param;
+ unsigned long port_id;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, &end_param) != 0)
return -1;
- /* Get dev ID from parameter string */
- dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
- if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+ if (*end_param != ',' || !isdigit((unsigned char)end_param[1]))
return -1;
- port_id = strtoul(p_param, &end_param, 10);
- p_param = strtok(NULL, "\0");
- if (p_param != NULL)
+ port_id = strtoul(end_param + 1, &end_param, 10);
+ if (port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
+ RTE_EDEV_LOG_DEBUG("Invalid port id out of range %lu", port_id);
+ return -1;
+ }
+
+ if (*end_param != '\0')
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
@@ -1998,19 +2009,12 @@ handle_dev_xstats(const char *cmd __rte_unused,
const char *params,
struct rte_tel_data *d)
{
- int dev_id;
+ uint8_t dev_id;
enum rte_event_dev_xstats_mode mode;
- char *end_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, NULL) != 0)
return -1;
- /* Get dev ID from parameter string */
- dev_id = strtoul(params, &end_param, 10);
- if (*end_param != '\0')
- RTE_EDEV_LOG_DEBUG(
- "Extra parameters passed to eventdev telemetry command, ignoring");
-
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
mode = RTE_EVENT_DEV_XSTATS_DEVICE;
@@ -2022,29 +2026,25 @@ handle_port_xstats(const char *cmd __rte_unused,
const char *params,
struct rte_tel_data *d)
{
- int dev_id;
- int port_queue_id = 0;
+ uint8_t dev_id;
enum rte_event_dev_xstats_mode mode;
+ unsigned long port_queue_id;
char *end_param;
- const char *p_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, &end_param) != 0)
return -1;
-
- /* Get dev ID from parameter string */
- dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
mode = RTE_EVENT_DEV_XSTATS_PORT;
- if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+ if (*end_param != ',' || !isdigit((unsigned char)end_param[1]))
return -1;
- port_queue_id = strtoul(p_param, &end_param, 10);
+ port_queue_id = strtoul(end_param + 1, &end_param, 10);
+ if (port_queue_id >= RTE_EVENT_MAX_PORTS_PER_DEV)
+ return -1;
- p_param = strtok(NULL, "\0");
- if (p_param != NULL)
+ if (*end_param != '\0')
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
@@ -2056,29 +2056,26 @@ handle_queue_xstats(const char *cmd __rte_unused,
const char *params,
struct rte_tel_data *d)
{
- int dev_id;
- int port_queue_id = 0;
+ uint8_t dev_id;
+ unsigned long port_queue_id;
enum rte_event_dev_xstats_mode mode;
char *end_param;
- const char *p_param;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, &end_param) != 0)
return -1;
- /* Get dev ID from parameter string */
- dev_id = strtoul(params, &end_param, 10);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
- p_param = strtok(end_param, ",");
mode = RTE_EVENT_DEV_XSTATS_QUEUE;
- if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+ if (*end_param != ',' || !isdigit((unsigned char)end_param[1]))
return -1;
- port_queue_id = strtoul(p_param, &end_param, 10);
+ port_queue_id = strtoul(end_param + 1, &end_param, 10);
+ if (port_queue_id >= RTE_EVENT_MAX_QUEUES_PER_DEV)
+ return -1;
- p_param = strtok(NULL, "\0");
- if (p_param != NULL)
+ if (*end_param != '\0')
RTE_EDEV_LOG_DEBUG(
"Extra parameters passed to eventdev telemetry command, ignoring");
@@ -2090,19 +2087,14 @@ handle_dev_dump(const char *cmd __rte_unused,
const char *params,
struct rte_tel_data *d)
{
- char *buf, *end_param;
- int dev_id, ret;
+ char *buf;
+ uint8_t dev_id;
+ int ret;
FILE *f;
- if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+ if (parse_dev_id(params, &dev_id, NULL) != 0)
return -1;
- /* Get dev ID from parameter string */
- dev_id = strtoul(params, &end_param, 10);
- if (*end_param != '\0')
- RTE_EDEV_LOG_DEBUG(
- "Extra parameters passed to eventdev telemetry command, ignoring");
-
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
buf = calloc(RTE_TEL_MAX_SINGLE_STRING_LEN, sizeof(char));
--
2.53.0
next prev parent reply other threads:[~2026-06-05 20:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 20:50 [PATCH 0/8] telemetry: thread-safe and bounded parameter parsing Stephen Hemminger
2026-06-05 20:50 ` [PATCH 1/8] telemetry: fix thread-unsafe command parsing Stephen Hemminger
2026-06-05 20:50 ` [PATCH 2/8] ethdev: make telemetry parameter parsing thread-safe Stephen Hemminger
2026-06-05 20:51 ` [PATCH 3/8] dmadev: validate telemetry parameters Stephen Hemminger
2026-06-05 20:51 ` [PATCH 4/8] security: harden telemetry parameter parsing Stephen Hemminger
2026-06-05 20:51 ` Stephen Hemminger [this message]
2026-06-05 20:51 ` [PATCH 6/8] eventdev/eth_rx: fix thread-unsafe telemetry parsing Stephen Hemminger
2026-06-05 20:51 ` [PATCH 7/8] eventdev/eth_rx: reject out-of-range telemetry adapter ID Stephen Hemminger
2026-06-05 20:51 ` [PATCH 8/8] eventdev/timer: reject out-of-range ID Stephen Hemminger
2026-06-06 6:08 ` [PATCH 0/8] telemetry: thread-safe and bounded parameter parsing Stephen Hemminger
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=20260605205253.520196-6-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=stable@dpdk.org \
/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