linux-kernel - Re: [PATCH v2 7/9] test_sysctl: add simple proc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAGXu5j+NRKucpz64qiL4Qj+JtNHYV9=3Xih6nwXFYTwq6dg7-w@mail.gmail.com>
Date:   Mon, 13 Feb 2017 14:00:13 -0800
From:   Kees Cook <keescook@...omium.org>
To:     "Luis R. Rodriguez" <mcgrof@...nel.org>
Cc:     Al Viro <viro@...iv.linux.org.uk>,
        Andrew Morton <akpm@...ux-foundation.org>,
        "Eric W. Biederman" <ebiederm@...ssion.com>,
        Arnaldo Carvalho de Melo <acme@...hat.com>,
        Ingo Molnar <mingo@...nel.org>, Mel Gorman <mgorman@...e.de>,
        Subash Abhinov Kasiviswanathan <subashab@...eaurora.org>,
        Jessica Yu <jeyu@...hat.com>,
        Rusty Russell <rusty@...tcorp.com.au>,
        Steven Whitehouse <swhiteho@...hat.com>,
        deepa.kernel@...il.com, Matt Fleming <matt@...eblueprint.co.uk>,
        Alexey Dobriyan <adobriyan@...il.com>,
        Borislav Petkov <bp@...e.de>,
        Dmitry Torokhov <dmitry.torokhov@...il.com>, shuah@...nel.org,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Guenter Roeck <linux@...ck-us.net>,
        linux-kselftest@...r.kernel.org,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 7/9] test_sysctl: add simple proc_dointvec() case

On Fri, Feb 10, 2017 at 4:36 PM, Luis R. Rodriguez <mcgrof@...nel.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@...nel.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