summaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-23 17:30:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-23 17:30:42 -0700
commite9e969797bae359fd463f7617ad875bca2771586 (patch)
tree2340854201806089bd2c28c5250eb64d048e6133 /fs/exec.c
parent5ad7ff8738b8bd238ca899df08badb1f61bcc39e (diff)
parentb6f5ee4d53019443fb99dd23bc08680b1244ccfa (diff)
downloadlinux-stable-e9e969797bae359fd463f7617ad875bca2771586.tar.gz
linux-stable-e9e969797bae359fd463f7617ad875bca2771586.tar.bz2
linux-stable-e9e969797bae359fd463f7617ad875bca2771586.zip
Merge tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve fix from Kees Cook: "This moves the exec and binfmt_elf tests out of your way and into the tests/ subdirectory, following the newly ratified KUnit naming conventions. :)" * tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: execve: Move KUnit tests to tests/ subdirectory
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c
index a47d0e4c54f6..37f33212123c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -2236,5 +2236,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