Parsing a corelist without a value dereferences val_set even when no
default is configured. This also occurs with
rte_argparse_parse_type(NULL, RTE_ARGPARSE_VALUE_TYPE_CORELIST, &cpus).
Return -EINVAL when the default is missing. Reject a NULL input string
or output pointer in rte_argparse_parse_type() before parsing the value.
Add regression tests for both parsing APIs and copying a configured
default.
Fixes: d78103fb9488 ("argparse: support core lists")
Cc: [email protected]
Signed-off-by: Artem Novikov <[email protected]>
---
v2:
* Reject NULL str or val in rte_argparse_parse_type(), as requested.
* Add a regression test for a NULL output pointer.
app/test/test_argparse.c | 27 +++++++++++++++++++++++++--
lib/argparse/rte_argparse.c | 8 ++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index fdc6dd1..1b0db25 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -501,9 +501,10 @@ test_argparse_opt_autosave_parse_int_of_optional_val(void)
}
static int
-test_argparse_opt_parse_corelist_of_required_val(void)
+test_argparse_opt_parse_corelist(void)
{
struct rte_argparse *obj;
+ rte_cpuset_t default_cpuset;
rte_cpuset_t val_cpuset;
char *argv[3];
int ret;
@@ -531,6 +532,21 @@ test_argparse_opt_parse_corelist_of_required_val(void)
TEST_ASSERT(CPU_ISSET(5, &val_cpuset), "Core 5 should be set in
corelist!");
TEST_ASSERT(!CPU_ISSET(6, &val_cpuset), "Core 6 should not be set in
corelist!");
+ CPU_ZERO(&default_cpuset);
+ CPU_SET(2, &default_cpuset);
+ obj->args[0].value_required = RTE_ARGPARSE_VALUE_OPTIONAL;
+ obj->args[0].val_set = &default_cpuset;
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == 2, "Default corelist should be accepted, got %d",
ret);
+ TEST_ASSERT(memcmp(&val_cpuset, &default_cpuset, sizeof(val_cpuset)) ==
0,
+ "Default corelist was not copied");
+
+ obj->args[0].val_set = NULL;
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == -EINVAL, "Missing default should return -EINVAL, got
%d", ret);
+ TEST_ASSERT(memcmp(&val_cpuset, &default_cpuset, sizeof(val_cpuset)) ==
0,
+ "Rejected corelist changed the saved value");
+
return 0;
}
@@ -966,6 +982,13 @@ test_argparse_parse_type_corelist(void)
RTE_ARGPARSE_VALUE_TYPE_CORELIST, &val_cpuset);
TEST_ASSERT(ret != 0, "Argparse parse type for corelist (out of range)
should have failed!");
+ ret = rte_argparse_parse_type(NULL, RTE_ARGPARSE_VALUE_TYPE_CORELIST,
+ &val_cpuset);
+ TEST_ASSERT(ret == -EINVAL, "NULL corelist should return -EINVAL, got
%d", ret);
+
+ ret = rte_argparse_parse_type("0", RTE_ARGPARSE_VALUE_TYPE_CORELIST,
NULL);
+ TEST_ASSERT(ret == -EINVAL, "NULL saver should return -EINVAL, got %d",
ret);
+
return 0;
}
@@ -1588,7 +1611,7 @@ static struct unit_test_suite argparse_test_suite = {
TEST_CASE(test_argparse_opt_autosave_parse_int_of_no_val),
TEST_CASE(test_argparse_opt_autosave_parse_int_of_required_val),
TEST_CASE(test_argparse_opt_autosave_parse_int_of_optional_val),
- TEST_CASE(test_argparse_opt_parse_corelist_of_required_val),
+ TEST_CASE(test_argparse_opt_parse_corelist),
TEST_CASE(test_argparse_opt_callback_parse_int_of_no_val),
TEST_CASE(test_argparse_opt_callback_parse_int_of_required_val),
TEST_CASE(test_argparse_opt_callback_parse_int_of_optional_val),
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 88c3e77..188134a 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -576,6 +576,8 @@ parse_arg_corelist(const struct rte_argparse_arg *arg,
const char *value)
int min = -1;
if (value == NULL) {
+ if (arg->val_set == NULL)
+ return -EINVAL;
*cpuset = *(rte_cpuset_t *)arg->val_set;
return 0;
}
@@ -971,6 +973,12 @@ rte_argparse_parse_type(const char *str, enum
rte_argparse_value_type val_type,
.val_set = NULL,
.value_type = val_type,
};
+
+ if (str == NULL || val == NULL) {
+ ARGPARSE_LOG(ERR, "argument and value must both be non-NULL!");
+ return -EINVAL;
+ }
+
if (val_type == RTE_ARGPARSE_VALUE_TYPE_NONE) {
ARGPARSE_LOG(ERR, "argument %s doesn't have value-type!", str);
return -EINVAL;
--
2.56.0