security: harden telemetry parameter parsing
PATCH 1/1 security: harden telemetry parameter parsing
The cryptodev security telemetry handlers parsed dev_id/capa_id with strtoul() and no overflow or range check, so an out-of-range dev_id (e.g. 256) silently truncated to a valid device in rte_cryptodev_is_valid_dev(). isdigit() was also called on a plain (signed) char, which is undefined for high-bit input.
The parser was also using strtok() which is not thread safe.
Use a validated parse helper and reject malformed input rather than logging and continuing. This also drops the thread-unsafe strtok() in the crypto_caps handler.
--- lib/security/rte_security.c | 41 ++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-)
lib/security/rte_security.c +27 -14
@@ -7,6 +7,8 @@#include <stdalign.h> #include <ctype.h> #include <stdlib.h> +#include <errno.h> +#include <limits.h> #include <eal_export.h> #include <rte_cryptodev.h>
@@ -474,6 +476,25 @@ security_capabilities_from_dev_id(int dev_id, const void **caps)return 0 ; } +/* Parse an unsigned integer parameter, returning the value or -EINVAL. +* 'max' must be <= INT_MAX. +*/ +static int +telemetry_parse_uint (const char *str,char **end,unsigned long max) +{ +unsigned long val; + +if (str ==NULL || !isdigit ((unsigned char )*str)) +return -EINVAL ; + + errno =0 ; + val =strtoul (str, end,0 ); +if (errno !=0 || val > max) +return -EINVAL ; + +return (int )val; +} +static int security_handle_cryptodev_sec_caps(const char *cmd __rte_unused, const char *params,struct rte_tel_data *d)
@@ -485,13 +506,10 @@ security_handle_cryptodev_sec_caps(const char *cmd __rte_unused, const char *parint dev_id;int rc; -if (!params ||strlen (params) ==0 || !isdigit (*params)) + dev_id =telemetry_parse_uint (params, &end_param,RTE_CRYPTO_MAX_DEVS -1 ); +if (dev_id <0 || *end_param !='\0' )return -EINVAL ; - dev_id =strtoul (params, &end_param,0 ); -if (*end_param !='\0' ) -CDEV_LOG_ERR ("Extra parameters passed to command, ignoring" ); - rc =security_capabilities_from_dev_id (dev_id, (void *)&capabilities);if (rc <0 )return rc;
@@ -513,24 +531,19 @@ security_handle_cryptodev_crypto_caps(const char *cmd __rte_unused, const char * {const struct rte_security_capability *capabilities;struct rte_tel_data *crypto_caps; -const char *capa_param;int dev_id, capa_id;int crypto_caps_n;char *end_param;int rc; -if (!params ||strlen (params) ==0 || !isdigit (*params)) + dev_id =telemetry_parse_uint (params, &end_param,RTE_CRYPTO_MAX_DEVS -1 ); +if (dev_id <0 || *end_param !=',' )return -EINVAL ; - dev_id =strtoul (params, &end_param,0 ); - capa_param =strtok (end_param,"," ); -if (!capa_param ||strlen (capa_param) ==0 || !isdigit (*capa_param)) + capa_id =telemetry_parse_uint (end_param +1 , &end_param,INT_MAX ); +if (capa_id <0 || *end_param !='\0' )return -EINVAL ; - capa_id =strtoul (capa_param, &end_param,0 ); -if (*end_param !='\0' ) -CDEV_LOG_ERR ("Extra parameters passed to command, ignoring" ); - rc =security_capabilities_from_dev_id (dev_id, (void *)&capabilities);if (rc <0 )return rc;
Signature · 1 line
2.53.0
Quoted 7 lines
The cryptodev security telemetry handlers parsed dev_id/capa_id with
strtoul()and no overflow or range check, so an out-of-rangedev_id(e.g. 256) silently truncated to a valid device inrte_cryptodev_is_valid_dev().isdigit()was also called on a plain (signed) char, which is undefined for high-bit input.
The parser was also usingstrtok()which is not thread safe.
Quoted 8 lines
Use a validated parse helper and reject malformed input rather than logging and continuing. This also drops the thread-unsafe
strtok()in thecrypto_capshandler.Fixes 259ca6d1617f ("security: add telemetry endpoint for capabilities")Signed-off-by Stephen Hemminger <[email protected]>
This patch seems to be already merged in main tree as part of other series. Marking it as superseded.