diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 14:45:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 14:45:12 -0700 |
| commit | b32273ee89a866b01b316b9a8de407efde01090c (patch) | |
| tree | 61c1bff2de438cc4a644ea34a7531807fc4b0cd6 /tools | |
| parent | 41cb8c332bb904cd2108250075d195e060e1fdc7 (diff) | |
| parent | 725d50261285ccf02501f2a1a6d10b31ce014597 (diff) | |
Merge tag 'execve-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve updates from Kees Cook:
- Drop needless error path code in remove_arg_zero() (Li kunyu, Kees
Cook)
- binfmt_elf_efpic: Don't use missing interpreter's properties (Max
Filippov)
- Use /bin/bash for execveat selftests
* tag 'execve-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
exec: Simplify remove_arg_zero() error path
selftests/exec: Perform script checks with /bin/bash
exec: Delete unnecessary statements in remove_arg_zero()
fs: binfmt_elf_efpic: don't use missing interpreter's properties
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/exec/execveat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index bf79d664c8e6..0546ca24f2b2 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c @@ -393,7 +393,7 @@ static int run_tests(void) static void prerequisites(void) { int fd; - const char *script = "#!/bin/sh\nexit $*\n"; + const char *script = "#!/bin/bash\nexit $*\n"; /* Create ephemeral copies of files */ exe_cp("execveat", "execveat.ephemeral"); |