From: Martin Wilck <mwilck@xxxxxxxx>
Use strtol() to check for valid input, but don't return error
as that would cause config file parsing to fail because of a
single typo. Also, add set_uint() to parse an unsigned parameter.
Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
---
libmultipath/dict.c | 48 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index 2b046e1d..c23d525b 100644
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -31,16 +31,58 @@ static int
set_int(vector strvec, void *ptr)
{
int *int_ptr = (int *)ptr;
- char * buff;
+ char *buff, *eptr;
+ long res;
+ int rc;
buff = set_value(strvec);
if (!buff)
return 1;
- *int_ptr = atoi(buff);
+ res = strtol(buff, &eptr, 10);
+ if (eptr > buff)
+ while (isspace(*eptr))
+ eptr++;
+ if (*buff == '\0' || *eptr != '\0' || res > INT_MAX || res < INT_MIN) {
+ condlog(1, "%s: invalid value for %s: \"%s\"",
+ __func__, (char*)VECTOR_SLOT(strvec, 0), buff);
+ rc = 1;
+ } else {
+ rc = 0;
+ *int_ptr = res;
+ }
FREE(buff);
- return 0;
+ return rc;
+}
+
+static int
+set_uint(vector strvec, void *ptr)
+{
+ unsigned int *uint_ptr = (unsigned int *)ptr;
+ char *buff, *eptr;
+ long res;
+ int rc;
+
+ buff = set_value(strvec);
+ if (!buff)
+ return 1;
+
+ res = strtol(buff, &eptr, 10);
+ if (eptr > buff)
+ while (isspace(*eptr))
+ eptr++;
+ if (*buff == '\0' || *eptr != '\0' || res < 0 || res > UINT_MAX) {
+ condlog(1, "%s: invalid value for %s: \"%s\"",
+ __func__, (char*)VECTOR_SLOT(strvec, 0), buff);
+ rc = 1;
+ } else {
+ rc = 0;
+ *uint_ptr = res;
+ }
+
+ FREE(buff);
+ return rc;
}
static int
--
2.23.0
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
