diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-28 13:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-28 13:36:01 -0700 |
| commit | 609f036d8b93f17d18dc904eecf50b2b086772f6 (patch) | |
| tree | 5ff1eb6b5e3076efe4026c2f94d9ecf8085c051f /tools/testing | |
| parent | 3b5f4b83c4abc0c9b0a7b9e2b44e816611b7f2ec (diff) | |
| parent | 3421b9b056a6576d0ebac1030eafb48ad0544092 (diff) | |
Merge tag 'hardening-v7.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- lkdtm: fix missed rename of STACKLEAK_ERASING to KSTACK_ERASE
(Haofeng Li)
- selftests/seccomp: Fix pointer type mismatch build error
(Kuan-Ying Lee)
- tests/fortify: Disable -Wstringop-overread (Nathan Chancellor)
* tag 'hardening-v7.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
selftests/seccomp: Fix pointer type mismatch build error
selftests/lkdtm: rename STACKLEAK_ERASING to KSTACK_ERASE
fortify: Disable -Wstringop-overread in tests
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/lkdtm/tests.txt | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt index d8180bbe31e8..bec57a02913a 100644 --- a/tools/testing/selftests/lkdtm/tests.txt +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -78,7 +78,7 @@ USERCOPY_STACK_FRAME_TO USERCOPY_STACK_FRAME_FROM USERCOPY_STACK_BEYOND USERCOPY_KERNEL -STACKLEAK_ERASING OK: the rest of the thread stack is properly erased +KSTACK_ERASE OK: the rest of the thread stack is properly erased CFI_FORWARD_PROTO CFI_BACKWARD call trace:|ok: control flow unchanged FORTIFY_STRSCPY detected buffer overflow diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 358b6c65e120..0622bc2acad4 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -5178,7 +5178,8 @@ FIXTURE_SETUP(UPROBE) ASSERT_GE(bit, 0); } - offset = get_uprobe_offset(variant->uretprobe ? probed_uretprobe : probed_uprobe); + offset = get_uprobe_offset(variant->uretprobe ? (void *)probed_uretprobe + : (void *)probed_uprobe); ASSERT_GE(offset, 0); if (variant->uretprobe) |