Skip to contentSkip to conversation

MAINTAINERS: adjust entries in FORTIFY_SOURCE and KERNEL HARDENING

PATCH In review Lukas Bulwahn 2 participants 2 messages Feb 17, 2025 – Feb 22, 2025 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MAINTAINERS: adjust entries in FORTIFY_SOURCE and KERNEL HARDENING

From: Lukas Bulwahn <[email protected]>

Commit db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory") adds a file entry to the non-existing file scripts/test_fortify.sh. Probably, this entry intends to refer to ./lib/test_fortify/test_fortify.sh, though. As that file is already covered by the entry lib/test_fortify/*, there is no need for a separate file entry. So, drop the unnecessary file entry to the test_fortify script.

Further, this commit misses to adjust the entry referring to lib/usercopy_kunit.c, which is moved to lib/tests. So, also adjust that file entry.

Fixes db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory")
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
MAINTAINERS +1 -2
index 53cf3cbf33c9..15632a34b740 100644
@@ -9070,7 +9070,6 @@ F:	include/linux/fortify-string.h
 F:	lib/test_fortify/*
 F:	lib/tests/fortify_kunit.c
 F:	lib/tests/memcpy_kunit.c
-F:	scripts/test_fortify.sh
 K:	\bunsafe_memcpy\b
 K:	\b__NO_FORTIFY\b
 
@@ -12613,7 +12612,7 @@ F:	arch/*/configs/hardening.config
 F:	include/linux/overflow.h
 F:	include/linux/randomize_kstack.h
 F:	kernel/configs/hardening.config
-F:	lib/usercopy_kunit.c
+F:	lib/tests/usercopy_kunit.c
 F:	mm/usercopy.c
 F:	security/Kconfig.hardening
 K:	\b(add|choose)_random_kstack_offset\b
Signature · 1 line
2.48.1
#1 lore raw
Quoted 8 lines · Lukas Bulwahn

Commit db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory") adds a file entry to the non-existing file scripts/test_fortify.sh. Probably, this entry intends to refer to ./lib/test_fortify/test_fortify.sh, though. As that file is already covered by the entry lib/test_fortify/*, there is no need for a separate file entry. So, drop the unnecessary file entry to the test_fortify script.

[...]

Applied to for-next/move-kunit-tests, thanks!

[1/1] MAINTAINERS: adjust entries in FORTIFY_SOURCE and KERNEL HARDENING

      https://git.kernel.org/kees/c/ee0445d6b6e9

Take care,

Signature · 1 line
Kees Cook