The patch titled Subject: tools/testing/selftests/sysctl/sysctl.sh: add range clamping test has been added to the -mm tree. Its filename is test_sysctl-add-range-clamping-test.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/test_sysctl-add-range-clamping-test.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/test_sysctl-add-range-clamping-test.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Waiman Long <longman@xxxxxxxxxx> Subject: tools/testing/selftests/sysctl/sysctl.sh: add range clamping test Add a range clamping test for the msgmni sysctl parameter to verify that the input value will be clamped if it exceeds the builtin maximum or minimum value. Below is the expected test run result: Running test: sysctl_test_0006 - run #0 Checking range minimum clamping ... ok Checking range maximum clamping ... ok Link: http://lkml.kernel.org/r/1520885744-1546-7-git-send-email-longman@xxxxxxxxxx Signed-off-by: Waiman Long <longman@xxxxxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxx> Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/sysctl/sysctl.sh | 43 +++++++++++++++++++++ 1 file changed, 43 insertions(+) diff -puN tools/testing/selftests/sysctl/sysctl.sh~test_sysctl-add-range-clamping-test tools/testing/selftests/sysctl/sysctl.sh --- a/tools/testing/selftests/sysctl/sysctl.sh~test_sysctl-add-range-clamping-test +++ a/tools/testing/selftests/sysctl/sysctl.sh @@ -34,6 +34,7 @@ ALL_TESTS="$ALL_TESTS 0002:1:1" ALL_TESTS="$ALL_TESTS 0003:1:1" ALL_TESTS="$ALL_TESTS 0004:1:1" ALL_TESTS="$ALL_TESTS 0005:3:1" +ALL_TESTS="$ALL_TESTS 0006:1:1" test_modprobe() { @@ -62,6 +63,9 @@ function allow_user_defaults() if [ -z $WRITES_STRICT ]; then WRITES_STRICT="${PROD_SYSCTL}/kernel/sysctl_writes_strict" fi + if [ -z $MSGMNI ]; then + MSGMNI="${PROD_SYSCTL}/kernel/msgmni" + fi } function check_production_sysctl_writes_strict() @@ -543,6 +547,34 @@ run_stringtests() test_rc } +# TARGET, BEYOND_MIN & BEYOND_MAX need to be defined before running test. +run_range_clamping_test() +{ + echo -n "Checking range minimum clamping ... " + echo $BEYOND_MIN > "$TARGET" > /dev/null 2>&1 + EXITVAL=$? + NEWVAL=$(cat "$TARGET") + if [[ $EXITVAL -ne 0 || $NEWVAL -le $BEYOND_MIN ]]; then + echo "FAIL" >&2 + rc=1 + else + echo "ok" + fi + + echo -n "Checking range maximum clamping ... " + echo $BEYOND_MAX > "$TARGET" > /dev/null 2>&1 + EXITVAL=$? + NEWVAL=$(cat "$TARGET") + if [[ $EXITVAL -ne 0 || $NEWVAL -ge $BEYOND_MAX ]]; then + echo "FAIL" >&2 + rc=1 + else + echo "ok" + fi + + test_rc +} + sysctl_test_0001() { TARGET="${SYSCTL}/int_0001" @@ -600,6 +632,17 @@ sysctl_test_0005() run_limit_digit_int_array } +sysctl_test_0006() +{ + TARGET="${MSGMNI}" + ORIG=$(cat "${TARGET}") + BEYOND_MIN=-1 + BEYOND_MAX=1000000000 + + run_range_clamping_test + set_orig +} + list_tests() { echo "Test ID list:" _ Patches currently in -mm which might be from longman@xxxxxxxxxx are list_lru-prefetch-neighboring-list-entries-before-acquiring-lock.patch proc-sysctl-fix-typo-in-sysctl_check_table_array.patch sysctl-add-kdoc-comments-to-do_proc_douintvec_minmax_conv_param.patch sysctl-add-flags-to-support-min-max-range-clamping.patch proc-sysctl-check-for-invalid-flags-bits.patch sysctl-warn-when-a-clamped-sysctl-parameter-is-set-out-of-range.patch ipc-clamp-msgmni-and-shmmni-to-the-real-ipcmni-limit.patch ipc-clamp-semmni-to-the-real-ipcmni-limit.patch test_sysctl-add-range-clamping-test.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html