diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-22 15:51:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-22 15:51:06 +0200 |
| commit | d8a54d2e42190abd68bd5d7d3ac472f440ab8fb3 (patch) | |
| tree | 2b4934bffa5c214a4d6193e0367c610b902aca4c /tools/testing/selftests | |
| parent | c50c29a806113614098efd8da9fd7b48d605ba45 (diff) | |
| parent | 2e53b877dc1258d4ac3de98f496bb88ec3bf5e25 (diff) | |
| download | linux-d8a54d2e42190abd68bd5d7d3ac472f440ab8fb3.tar.bz2 | |
Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-next
Kees writes:
lkdtm updates for next
Christophe Leroy (1):
lkdtm/bugs: Don't expect thread termination without CONFIG_UBSAN_TRAP
Jiasheng Jiang (1):
lkdtm/bugs: Check for the NULL pointer after calling kmalloc
Kees Cook (4):
lkdtm/heap: Note conditions for SLAB_LINEAR_OVERFLOW
lkdtm/usercopy: Expand size of "out of frame" object
lkdtm: Move crashtype definitions into each category
lkdtm: Add CFI_BACKWARD to test ROP mitigations
* tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
lkdtm: Add CFI_BACKWARD to test ROP mitigations
lkdtm: Move crashtype definitions into each category
lkdtm/bugs: Don't expect thread termination without CONFIG_UBSAN_TRAP
lkdtm/usercopy: Expand size of "out of frame" object
lkdtm/heap: Note conditions for SLAB_LINEAR_OVERFLOW
lkdtm/bugs: Check for the NULL pointer after calling kmalloc
Diffstat (limited to 'tools/testing/selftests')
| -rw-r--r-- | tools/testing/selftests/lkdtm/config | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/lkdtm/tests.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config index 46f39ee76208..304123688739 100644 --- a/tools/testing/selftests/lkdtm/config +++ b/tools/testing/selftests/lkdtm/config @@ -9,3 +9,5 @@ CONFIG_UBSAN=y CONFIG_UBSAN_BOUNDS=y CONFIG_UBSAN_TRAP=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_SLUB_DEBUG=y +CONFIG_SLUB_DEBUG_ON=y diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt index 243c781f0780..9dace01dbf15 100644 --- a/tools/testing/selftests/lkdtm/tests.txt +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -74,6 +74,7 @@ USERCOPY_STACK_BEYOND USERCOPY_KERNEL STACKLEAK_ERASING OK: the rest of the thread stack is properly erased CFI_FORWARD_PROTO +CFI_BACKWARD call trace:|ok: control flow unchanged FORTIFIED_STRSCPY FORTIFIED_OBJECT FORTIFIED_SUBOBJECT |