Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1580098
| From | Kees Cook <keescook@chromium.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 7/9] test_sysctl: add simple proc_dointvec() case |
| Date | 2017-02-13 23:10 +0100 |
| Message-ID | <tawYO-1dY-13@gated-at.bofh.it> (permalink) |
| References | <t8LSh-7Ue-11@gated-at.bofh.it> <t9tTj-29U-3@gated-at.bofh.it> <t9tTk-29U-27@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Fri, Feb 10, 2017 at 4:36 PM, Luis R. Rodriguez <mcgrof@kernel.org> wrote:
> Test against a simple proc_dointvec() case. While at it, add
> a test against INT_MAX. Make sure INT_MAX works, and INT_MAX+1
> will fail. Also test negative values work.
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
> ---
> lib/test_sysctl.c | 11 ++++++
> tools/testing/selftests/sysctl/sysctl.sh | 62 ++++++++++++++++++++++++++++++++
> 2 files changed, 73 insertions(+)
>
> diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c
> index 9b9ae1a95ab3..c36a024d7351 100644
> --- a/lib/test_sysctl.c
> +++ b/lib/test_sysctl.c
> @@ -34,11 +34,15 @@ static int i_one_hundred = 100;
>
> struct test_sysctl_data {
> int int_0001;
> + int int_0002;
> +
> char string_0001[65];
> };
>
> static struct test_sysctl_data test_data = {
> .int_0001 = 60,
> + .int_0002 = 1,
> +
> .string_0001 = "(none)",
> };
>
> @@ -54,6 +58,13 @@ static struct ctl_table test_table[] = {
> .extra2 = &i_one_hundred,
> },
> {
> + .procname = "int_0002",
> + .data = &test_data.int_0002,
> + .maxlen = sizeof(int),
> + .mode = 0644,
> + .proc_handler = proc_dointvec,
> + },
> + {
> .procname = "string_0001",
> .data = &test_data.string_0001,
> .maxlen = sizeof(test_data.string_0001),
> diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh
> index 14b9d875db42..45fd2ee5739c 100755
> --- a/tools/testing/selftests/sysctl/sysctl.sh
> +++ b/tools/testing/selftests/sysctl/sysctl.sh
> @@ -24,6 +24,7 @@ TEST_FILE=$(mktemp)
> # we have tons of space.
> ALL_TESTS="0001:1:1"
> ALL_TESTS="$ALL_TESTS 0002:1:1"
> +ALL_TESTS="$ALL_TESTS 0003:1:1"
>
> test_modprobe()
> {
> @@ -52,6 +53,9 @@ function allow_user_defaults()
> if [ -z $MAX_DIGITS ]; then
> MAX_DIGITS=$(($PAGE_SIZE/8))
> fi
> + if [ -z $INT_MAX ]; then
> + INT_MAX=$(getconf INT_MAX)
> + fi
> }
>
> test_reqs()
> @@ -92,6 +96,9 @@ reset_vals()
> int_0001)
> VAL="60"
> ;;
> + int_0002)
> + VAL="1"
> + ;;
> string_0001)
> VAL="(none)"
> ;;
> @@ -261,6 +268,48 @@ run_limit_digit()
> test_rc
> }
>
> +# You are using an int
> +run_limit_digit_int()
> +{
> + echo -n "Testing INT_MAX works ..."
> + reset_vals
> + TEST_STR="$INT_MAX"
> + echo -n $TEST_STR > $TARGET
> +
> + if ! verify "${TARGET}"; then
> + echo "FAIL" >&2
> + rc=1
> + else
> + echo "ok"
> + fi
> + test_rc
> +
> + echo -n "Testing INT_MAX + 1 will fail as expected..."
> + reset_vals
> + TEST_STR=$(($INT_MAX+1))
Is the shell always going to do the right thing here? Maybe these test
values should be explicitly hard-coded? I'm on the fence...
-Kees
--
Kees Cook
Pixel Security
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [PATCH] sysctl: add proper unsigned int support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-01 21:00 +0100
Re: [PATCH] sysctl: add proper unsigned int support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-09 02:40 +0100
Re: [PATCH] sysctl: add proper unsigned int support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-09 02:50 +0100
[PATCH v2 5/9] test_sysctl: add generic script to expand on tests "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 5/9] test_sysctl: add generic script to expand on tests Kees Cook <keescook@chromium.org> - 2017-02-13 21:40 +0100
[PATCH v2 9/9] test_sysctl: test against int proc_dointvec() array support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 9/9] test_sysctl: test against int proc_dointvec() array support Kees Cook <keescook@chromium.org> - 2017-02-13 23:10 +0100
[PATCH v2 4/9] test_sysctl: add dedicated proc sysctl test driver "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 4/9] test_sysctl: add dedicated proc sysctl test driver Kees Cook <keescook@chromium.org> - 2017-02-13 21:30 +0100
[PATCH v2 6/9] test_sysctl: test against PAGE_SIZE for int "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
[PATCH v2 1/9] sysctl: fix lax sysctl_check_table() sanity check "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 1/9] sysctl: fix lax sysctl_check_table() sanity check Kees Cook <keescook@chromium.org> - 2017-02-13 21:20 +0100
[PATCH v2 2/9] sysctl: add proper unsigned int support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 2/9] sysctl: add proper unsigned int support Kees Cook <keescook@chromium.org> - 2017-02-13 21:30 +0100
[PATCH v2 3/9] sysctl: add unsigned int range support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 3/9] sysctl: add unsigned int range support Kees Cook <keescook@chromium.org> - 2017-02-13 21:30 +0100
[PATCH v2 7/9] test_sysctl: add simple proc_dointvec() case "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 7/9] test_sysctl: add simple proc_dointvec() case Kees Cook <keescook@chromium.org> - 2017-02-13 23:10 +0100
[PATCH v2 0/9] sysctl: add and fix proper unsigned int support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
[PATCH v2 8/9] test_sysctl: add simple proc_douintvec() case "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-02-11 01:40 +0100
Re: [PATCH v2 0/9] sysctl: add and fix proper unsigned int support Kees Cook <keescook@chromium.org> - 2017-02-13 21:20 +0100
csiph-web