From: Kees Cook <keescook@chromium.org>
To: Orson Zhai <orson.zhai@linaro.org>
Cc: Shuah Khan <Shuah@kernel.org>,
linux-kselftest@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
Sumit Semwal <sumit.semwal@linaro.org>
Subject: Re: [PATCH] tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict
Date: Mon, 19 Jun 2017 12:01:56 -0700 [thread overview]
Message-ID: <CAGXu5j+S7FOJEW+xp-3wsQOiLZtMVZjRDSDnPU=xQr3+Mjuxeg@mail.gmail.com> (raw)
In-Reply-To: <CAPPenn_E8=8tToEi6QtSq+STWYhTMztA=P=gvxUZBydUSQwz7Q@mail.gmail.com>
On Fri, Jun 16, 2017 at 2:28 AM, Orson Zhai <orson.zhai@linaro.org> wrote:
> Sysctl test will fail in some items if the value of /proc/sys/kernel
> /sysctrl_writes_strict is 0 as the default value in kernel older than v4.5.
>
> Make this test more robust and compatible with older kernels by checking and
> update sysctrl_writes_strict value and restore it when test is done.
>
> Signed-off-by: Orson Zhai <orson.zhai@linaro.org>
> ---
> tools/testing/selftests/sysctl/common_tests | 14 ++++++++++++++
> tools/testing/selftests/sysctl/run_numerictests | 3 +++
> tools/testing/selftests/sysctl/run_stringtests | 3 +++
> 3 files changed, 20 insertions(+)
>
> diff --git a/tools/testing/selftests/sysctl/common_tests
> b/tools/testing/selftests/sysctl/common_tests
> index 17d534b1b7b4..f5c5c51d16f3 100644
> --- a/tools/testing/selftests/sysctl/common_tests
> +++ b/tools/testing/selftests/sysctl/common_tests
> @@ -63,6 +63,20 @@ else
> echo "ok"
> fi
>
> +echo -n "Checking writes strict setting ... "
> +WRITES_STRICT="${SYSCTL}/kernel/sysctl_writes_strict"
> +if [ ! -e ${WRITES_STRICT} ]; then
> + echo "FAIL, but skip in case of old kernel" >&2
> +else
> + val=$(cat ${WRITES_STRICT})
Can you give this a more meaningful name instead of "val". Perhaps "old_strict"?
> + if [ "$val" = "1" ]; then
> + echo "ok"
> + else
> + echo "FAIL, strict value is 0 but force to 1 to continue" >&2
> + echo "1" > ${WRITES_STRICT}
> + fi
> +fi
> +
> # Now that we've validated the sanity of "set_test" and "set_orig",
> # we can use those functions to set starting states before running
> # specific behavioral tests.
> diff --git a/tools/testing/selftests/sysctl/run_numerictests
> b/tools/testing/selftests/sysctl/run_numerictests
> index 8510f93f2d14..c0a98fd82c5c 100755
> --- a/tools/testing/selftests/sysctl/run_numerictests
> +++ b/tools/testing/selftests/sysctl/run_numerictests
> @@ -7,4 +7,7 @@ TEST_STR=$(( $ORIG + 1 ))
>
> . ./common_tests
>
> +if [ ! -z ${val} ]; then
> + echo ${val} > ${WRITES_STRICT}
> +fi
> exit $rc
> diff --git a/tools/testing/selftests/sysctl/run_stringtests
> b/tools/testing/selftests/sysctl/run_stringtests
> index 90a9293d520c..ae98d66a9ec6 100755
> --- a/tools/testing/selftests/sysctl/run_stringtests
> +++ b/tools/testing/selftests/sysctl/run_stringtests
> @@ -74,4 +74,7 @@ else
> echo "ok"
> fi
>
> +if [ ! -z ${val} ]; then
> + echo ${val} > ${WRITES_STRICT}
> +fi
> exit $rc
And instead of open-coding these, can you instead add an "exit_test"
function to common_tests, which will do this and the exit $rc?
-Kees
--
Kees Cook
Pixel Security
next prev parent reply other threads:[~2017-06-19 19:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170616042255.22653-1-orson.zhai@spreadtrum.com>
2017-06-16 9:28 ` Fwd: [PATCH] tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict Orson Zhai
2017-06-16 14:49 ` Sumit Semwal
2017-06-16 19:47 ` Orson Zhai
2017-06-19 19:01 ` Kees Cook [this message]
2017-06-20 9:28 ` Orson Zhai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGXu5j+S7FOJEW+xp-3wsQOiLZtMVZjRDSDnPU=xQr3+Mjuxeg@mail.gmail.com' \
--to=keescook@chromium.org \
--cc=Shuah@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=orson.zhai@linaro.org \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).