lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 260/281] selftests: kselftest_harness: Fix compile warning
    Date
    From: Mickaël Salaün <mic@digikod.net>

    [ Upstream commit 34a048cc06802556e5f96f325dc32cc2f6a11225 ]

    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@digikod.net>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Shuah Khan <shuahkh@osg.samsung.com>
    Cc: Will Drewry <wad@chromium.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    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 cbb0564c0ec4..f68998149351 100644
    --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
    +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
    @@ -1318,7 +1318,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.14.1
    \
     
     \ /
      Last update: 2018-03-19 17:06    [W:5.020 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site