niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

selftests/exec: Verify execve of non-regular files fail

Browse source 
Add a named pipe as an exec target to make sure that non-regular
files are rejected by execve() with EACCES. This can help verify
commit 73601ea5b7 ("fs/open.c: allow opening only regular files
during execve()").

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Kees Cook 2020-05-17 21:47:43 -07:00 • committed by Shuah Khan
parent a5f304670b
commit 61016db15b
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/testing/selftests/exec/.gitignore vendored
View file

@ -9,3 +9,4 @@ execveat.ephemeral
execveat.denatured execveat.denatured
/recursion-depth /recursion-depth
xxxxxxxx* xxxxxxxx*
pipe

2
tools/testing/selftests/exec/Makefile
View file

@ -4,7 +4,7 @@ CFLAGS += -Wno-nonnull
CFLAGS += -D_GNU_SOURCE CFLAGS += -D_GNU_SOURCE
TEST_GEN_PROGS := execveat TEST_GEN_PROGS := execveat
TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe
# Makefile is a run-time dependency, since it's accessed by the execveat test # Makefile is a run-time dependency, since it's accessed by the execveat test
TEST_FILES := Makefile TEST_FILES := Makefile

8
tools/testing/selftests/exec/execveat.c
View file

@ -5,7 +5,9 @@
* Selftests for execveat(2). * Selftests for execveat(2).
*/ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE /* to get O_PATH, AT_EMPTY_PATH */ #define _GNU_SOURCE /* to get O_PATH, AT_EMPTY_PATH */
#endif
#include <sys/sendfile.h> #include <sys/sendfile.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -311,6 +313,10 @@ static int run_tests(void)
fail += check_execveat_fail(AT_FDCWD, fullname_symlink, fail += check_execveat_fail(AT_FDCWD, fullname_symlink,
AT_SYMLINK_NOFOLLOW, ELOOP); AT_SYMLINK_NOFOLLOW, ELOOP);
/* Non-regular file failure */
fail += check_execveat_fail(dot_dfd, "pipe", 0, EACCES);
unlink("pipe");
/* Shell script wrapping executable file: */ /* Shell script wrapping executable file: */
/* dfd + path */ /* dfd + path */
fail += check_execveat(subdir_dfd, "../script", 0); fail += check_execveat(subdir_dfd, "../script", 0);
@ -384,6 +390,8 @@ static void prerequisites(void)
fd = open("subdir.ephemeral/script", O_RDWR|O_CREAT|O_TRUNC, 0755); fd = open("subdir.ephemeral/script", O_RDWR|O_CREAT|O_TRUNC, 0755);
write(fd, script, strlen(script)); write(fd, script, strlen(script));
close(fd); close(fd);
mkfifo("pipe", 0755);
} }
int main(int argc, char **argv) int main(int argc, char **argv)