selftests/lkdtm: Disable CONFIG_UBSAN_TRAP in test config
[ Upstream commitcf77bf6988] The lkdtm selftest config fragment enables CONFIG_UBSAN_TRAP to make the ARRAY_BOUNDS test kill the calling process when an out-of-bound access is detected by UBSAN. However, after this [1] commit, UBSAN is triggered under many new scenarios that weren't detected before, such as in struct definitions with fixed-size trailing arrays used as flexible arrays. As a result, CONFIG_UBSAN_TRAP=y has become a very aggressive option to enable except for specific situations. `make kselftest-merge` applies CONFIG_UBSAN_TRAP=y to the kernel config for all selftests, which makes many of them fail because of system hangs during boot. This change removes the config option from the lkdtm kselftest and configures the ARRAY_BOUNDS test to look for UBSAN reports rather than relying on the calling process being killed. [1] commit2d47c6956a("ubsan: Tighten UBSAN_BOUNDS on GCC")' Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20230802063252.1917997-1-ricardo.canuelo@collabora.com Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e9a27fdce5
commit
9f4c391dc2
2 changed files with 1 additions and 2 deletions
|
|
@ -9,7 +9,6 @@ CONFIG_INIT_ON_FREE_DEFAULT_ON=y
|
|||
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
|
||||
CONFIG_UBSAN=y
|
||||
CONFIG_UBSAN_BOUNDS=y
|
||||
CONFIG_UBSAN_TRAP=y
|
||||
CONFIG_STACKPROTECTOR_STRONG=y
|
||||
CONFIG_SLUB_DEBUG=y
|
||||
CONFIG_SLUB_DEBUG_ON=y
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ EXCEPTION
|
|||
#EXHAUST_STACK Corrupts memory on failure
|
||||
#CORRUPT_STACK Crashes entire system on success
|
||||
#CORRUPT_STACK_STRONG Crashes entire system on success
|
||||
ARRAY_BOUNDS
|
||||
ARRAY_BOUNDS call trace:|UBSAN: array-index-out-of-bounds
|
||||
CORRUPT_LIST_ADD list_add corruption
|
||||
CORRUPT_LIST_DEL list_del corruption
|
||||
STACK_GUARD_PAGE_LEADING
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue