lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0347/1017] selftests/lkdtm: Add UBSAN config
    Date
    From: Muhammad Usama Anjum <usama.anjum@collabora.com>

    [ Upstream commit 1900be289b598b2c553b3add13e491c0bb8a8550 ]

    UBSAN_BOUNDS and UBSAN_TRAP depend on UBSAN config option.
    merge_config.sh script generates following warnings if parent config
    doesn't have UBSAN config already enabled and UBSAN_BOUNDS/UBSAN_TRAP
    config options don't get added to the parent config.

    Value requested for CONFIG_UBSAN_BOUNDS not in final .config
    Requested value: CONFIG_UBSAN_BOUNDS=y
    Actual value:

    Value requested for CONFIG_UBSAN_TRAP not in final .config
    Requested value: CONFIG_UBSAN_TRAP=y
    Actual value:

    Fix this by including UBSAN config.

    Fixes: c75be56e35b2 ("lkdtm/bugs: Add ARRAY_BOUNDS to selftests")
    Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/lkdtm/config | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config
    index a26a3fa9e925..8bd847f0463c 100644
    --- a/tools/testing/selftests/lkdtm/config
    +++ b/tools/testing/selftests/lkdtm/config
    @@ -6,6 +6,7 @@ CONFIG_HARDENED_USERCOPY=y
    # CONFIG_HARDENED_USERCOPY_FALLBACK is not set
    CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
    CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
    +CONFIG_UBSAN=y
    CONFIG_UBSAN_BOUNDS=y
    CONFIG_UBSAN_TRAP=y
    CONFIG_STACKPROTECTOR_STRONG=y
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:12    [W:2.650 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site