linux-kernel - Re: [PATCH v1 2/2] selftests: kselftest

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]

Date:   Sun, 11 Jun 2017 19:22:33 -0700
From:   Kees Cook <keescook@...omium.org>
To:     Mickaël Salaün <mic@...ikod.net>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Andy Lutomirski <luto@...capital.net>,
        Shuah Khan <shuah@...nel.org>, Will Drewry <wad@...omium.org>,
        linux-kselftest@...r.kernel.org,
        Linux-Next <linux-next@...r.kernel.org>,
        Shuah Khan <shuahkh@....samsung.com>
Subject: Re: [PATCH v1 2/2] selftests: kselftest_harness: Fix compile warning

On Sun, Jun 11, 2017 at 5:32 AM, Mickaël Salaün <mic@...ikod.net> wrote:
> Do not confuse the compiler with a semicolon preceding a block. Replace
> the semicolon with an empty block to avoid a warning:
>
>   gcc -Wl,-no-as-needed -Wall -lpthread seccomp_bpf.c -o /.../linux/tools/testing/selftests/seccomp/seccomp_bpf
>   In file included from seccomp_bpf.c:40:0:
>   seccomp_bpf.c: In function ‘change_syscall’:
>   ../kselftest_harness.h:558:2: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation]
>     for (; _metadata->trigger;  _metadata->trigger = __bail(_assert))
>     ^
>   ../kselftest_harness.h:574:14: note: in expansion of macro ‘OPTIONAL_HANDLER’
>    } while (0); OPTIONAL_HANDLER(_assert)
>                 ^~~~~~~~~~~~~~~~
>   ../kselftest_harness.h:440:2: note: in expansion of macro ‘__EXPECT’
>     __EXPECT(expected, seen, ==, 0)
>     ^~~~~~~~
>   seccomp_bpf.c:1313:2: note: in expansion of macro ‘EXPECT_EQ’
>     EXPECT_EQ(0, ret);
>     ^~~~~~~~~
>   seccomp_bpf.c:1317:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘for’
>     {
>     ^
>
> Signed-off-by: Mickaël Salaün <mic@...ikod.net>
> Cc: Andy Lutomirski <luto@...capital.net>
> Cc: Kees Cook <keescook@...omium.org>
> Cc: Shuah Khan <shuahkh@....samsung.com>
> Cc: Will Drewry <wad@...omium.org>

Eek, thanks for catching that. :)

Acked-by: Kees Cook <keescook@...omium.org>

-Kees

> ---
>  tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
> index 7ba94efb24fd..18dad07ae16b 100644
> --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
> +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
> @@ -1310,7 +1310,7 @@ void change_syscall(struct __test_metadata *_metadata,
>         iov.iov_len = sizeof(regs);
>         ret = ptrace(PTRACE_GETREGSET, tracee, NT_PRSTATUS, &iov);
>  #endif
> -       EXPECT_EQ(0, ret);
> +       EXPECT_EQ(0, ret) {}
>
>  #if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \
>      defined(__s390__) || defined(__hppa__)
> --
> 2.11.0
>



-- 
Kees Cook
Pixel Security