execve: Move KUnit tests to tests/ subdirectory

Move the exec KUnit tests into a separate directory to avoid polluting
the local directory namespace. Additionally update MAINTAINERS for the
new files.

Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20240720170310.it.942-kees@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 8dfbe998f175f9b8df13c43de93d981359842b33..5fa7e129a59eb0cc54be854ec4715bd4941a0e91 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8220,7 +8220,8 @@ F:        Documentation/userspace-api/ELF.rst
 F:     fs/*binfmt_*.c
 F:     fs/Kconfig.binfmt
 F:     fs/exec.c
-F:     fs/exec_test.c
+F:     fs/tests/binfmt_*_kunit.c
+F:     fs/tests/exec_kunit.c
 F:     include/linux/binfmts.h
 F:     include/linux/elf.h
 F:     include/uapi/linux/binfmts.h

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 40111451aa95118018e88efc97522b44696d673b..04e748c5955f0d148b350ddf27d30d48eaa31555 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -2152,5 +2152,5 @@ core_initcall(init_elf_binfmt);
 module_exit(exit_elf_binfmt);
 
 #ifdef CONFIG_BINFMT_ELF_KUNIT_TEST
-#include "binfmt_elf_test.c"
+#include "tests/binfmt_elf_kunit.c"
 #endif

diff --git a/fs/exec.c b/fs/exec.c
index 5b580ff8d955660b26f7862074c18b013ef1971b..32d6537ece07dea54f08ba4c06b1cab87445d25d 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -2244,5 +2244,5 @@ fs_initcall(init_fs_exec_sysctls);
 #endif /* CONFIG_SYSCTL */
 
 #ifdef CONFIG_EXEC_KUNIT_TEST
-#include "exec_test.c"
+#include "tests/exec_kunit.c"
 #endif

diff --git a/fs/binfmt_elf_test.c b/fs/tests/binfmt_elf_kunit.c
similarity index 100%
rename from fs/binfmt_elf_test.c
rename to fs/tests/binfmt_elf_kunit.c

diff --git a/fs/exec_test.c b/fs/tests/exec_kunit.c
similarity index 100%
rename from fs/exec_test.c
rename to fs/tests/exec_kunit.c