lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 017/255] selftests: filter kselftest headers from command in lib.mk
    Date
    From: Tommi Rantala <tommi.t.rantala@nokia.com>

    [ Upstream commit f825d3f7ed9305e7dd0a3e0a74673a4257d0cc53 ]

    Commit 1056d3d2c97e ("selftests: enforce local header dependency in
    lib.mk") added header dependency to the rule, but as the rule uses $^,
    the headers are added to the compiler command line.

    This can cause unexpected precompiled header files being generated when
    compilation fails:

    $ echo { >> openat2_test.c

    $ make
    gcc -Wall -O2 -g -fsanitize=address -fsanitize=undefined openat2_test.c
    tools/testing/selftests/kselftest_harness.h tools/testing/selftests/kselftest.h helpers.c
    -o tools/testing/selftests/openat2/openat2_test
    openat2_test.c:313:1: error: expected identifier or ‘(’ before ‘{’ token
    313 | {
    | ^
    make: *** [../lib.mk:140: tools/testing/selftests/openat2/openat2_test] Error 1

    $ file openat2_test*
    openat2_test: GCC precompiled header (version 014) for C
    openat2_test.c: C source, ASCII text

    Fix it by filtering out the headers, so that we'll only pass the actual
    *.c files in the compiler command line.

    Fixes: 1056d3d2c97e ("selftests: enforce local header dependency in lib.mk")
    Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/lib.mk | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
    index 7a17ea8157367..66f3317dc3654 100644
    --- a/tools/testing/selftests/lib.mk
    +++ b/tools/testing/selftests/lib.mk
    @@ -137,7 +137,7 @@ endif
    ifeq ($(OVERRIDE_TARGETS),)
    LOCAL_HDRS := $(selfdir)/kselftest_harness.h $(selfdir)/kselftest.h
    $(OUTPUT)/%:%.c $(LOCAL_HDRS)
    - $(LINK.c) $^ $(LDLIBS) -o $@
    + $(LINK.c) $(filter-out $(LOCAL_HDRS),$^) $(LDLIBS) -o $@

    $(OUTPUT)/%.o:%.S
    $(COMPILE.S) $^ -o $@
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 15:10    [W:4.190 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site