test_sysctl: add simple proc_douintvec() case

Test against a simple proc_douintvec() case.  While at it, add a test
against UINT_MAX.  Make sure UINT_MAX works, and UINT_MAX+1 will fail
and that negative values are not accepted.

Link: http://lkml.kernel.org/r/20170630224431.17374-6-mcgrof@kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c
index 1472e1ae4931751fec878335163df06ba4e011ef..53db3513ab0829bb0f4d6a3901022bc387f5dff7 100644 (file)
--- a/lib/test_sysctl.c
+++ b/lib/test_sysctl.c
@@ -43,6 +43,8 @@ struct test_sysctl_data {
        int int_0001;
        int int_0002;
 
+       unsigned int uint_0001;
+
        char string_0001[65];
 };
 
@@ -50,6 +52,8 @@ static struct test_sysctl_data test_data = {
        .int_0001 = 60,
        .int_0002 = 1,
 
+       .uint_0001 = 314,
+
        .string_0001 = "(none)",
 };
 
@@ -71,6 +75,13 @@ static struct ctl_table test_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
+       {
+               .procname       = "uint_0001",
+               .data           = &test_data.uint_0001,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = proc_douintvec,
+       },
        {
                .procname       = "string_0001",
                .data           = &test_data.string_0001,

diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh
index 7ba3fa2bbd548ffcc3245b31e16f6b2cdc29eb3e..abeef675a8845f109fb4daec6afec966a76fa850 100644 (file)
--- a/tools/testing/selftests/sysctl/sysctl.sh
+++ b/tools/testing/selftests/sysctl/sysctl.sh
@@ -32,6 +32,7 @@ TEST_FILE=$(mktemp)
 ALL_TESTS="0001:1:1"
 ALL_TESTS="$ALL_TESTS 0002:1:1"
 ALL_TESTS="$ALL_TESTS 0003:1:1"
+ALL_TESTS="$ALL_TESTS 0004:1:1"
 
 test_modprobe()
 {
@@ -86,6 +87,9 @@ function check_production_sysctl_writes_strict()
        if [ -z $INT_MAX ]; then
                INT_MAX=$(getconf INT_MAX)
        fi
+       if [ -z $UINT_MAX ]; then
+               UINT_MAX=$(getconf UINT_MAX)
+       fi
 }
 
 test_reqs()
@@ -129,6 +133,9 @@ reset_vals()
                int_0002)
                        VAL="1"
                        ;;
+               uint_0001)
+                       VAL="314"
+                       ;;
                string_0001)
                        VAL="(none)"
                        ;;
@@ -345,6 +352,49 @@ run_limit_digit_int()
        test_rc
 }
 
+# You are using an unsigned int
+run_limit_digit_uint()
+{
+       echo -n "Testing UINT_MAX works ..."
+       reset_vals
+       TEST_STR="$UINT_MAX"
+       echo -n $TEST_STR > $TARGET
+
+       if ! verify "${TARGET}"; then
+               echo "FAIL" >&2
+               rc=1
+       else
+               echo "ok"
+       fi
+       test_rc
+
+       echo -n "Testing UINT_MAX + 1 will fail as expected..."
+       reset_vals
+       TEST_STR=$(($UINT_MAX+1))
+       echo -n $TEST_STR > $TARGET 2> /dev/null
+
+       if verify "${TARGET}"; then
+               echo "FAIL" >&2
+               rc=1
+       else
+               echo "ok"
+       fi
+       test_rc
+
+       echo -n "Testing negative values will not work as expected ..."
+       reset_vals
+       TEST_STR="-3"
+       echo -n $TEST_STR > $TARGET 2> /dev/null
+
+       if verify "${TARGET}"; then
+               echo "FAIL" >&2
+               rc=1
+       else
+               echo "ok"
+       fi
+       test_rc
+}
+
 run_stringtests()
 {
        echo -n "Writing entire sysctl in short writes ... "
@@ -450,6 +500,18 @@ sysctl_test_0003()
        run_limit_digit_int
 }
 
+sysctl_test_0004()
+{
+       TARGET="${SYSCTL}/uint_0001"
+       reset_vals
+       ORIG=$(cat "${TARGET}")
+       TEST_STR=$(( $ORIG + 1 ))
+
+       run_numerictests
+       run_limit_digit
+       run_limit_digit_uint
+}
+
 list_tests()
 {
        echo "Test ID list:"
@@ -461,6 +523,7 @@ list_tests()
        echo "0001 x $(get_test_count 0001) - tests proc_dointvec_minmax()"
        echo "0002 x $(get_test_count 0002) - tests proc_dostring()"
        echo "0003 x $(get_test_count 0003) - tests proc_dointvec()"
+       echo "0004 x $(get_test_count 0004) - tests proc_douintvec()"
 }
 
 test_reqs