Commit 9a0b5745 authored by Michael Ellerman's avatar Michael Ellerman Committed by Shuah Khan

selftests/exec: Check if the syscall exists and bail if not

On systems which don't implement sys_execveat(), this test produces a
lot of output.

Add a check at the beginning to see if the syscall is present, and if
not just note one error and return.

When we run on a system that doesn't implement the syscall we will get
ENOSYS back from the kernel, so change the logic that handles
__NR_execveat not being defined to also use ENOSYS rather than -ENOSYS.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Acked-by: default avatarDavid Drysdale <drysdale@google.com>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 9eccca08
...@@ -30,7 +30,7 @@ static int execveat_(int fd, const char *path, char **argv, char **envp, ...@@ -30,7 +30,7 @@ static int execveat_(int fd, const char *path, char **argv, char **envp,
#ifdef __NR_execveat #ifdef __NR_execveat
return syscall(__NR_execveat, fd, path, argv, envp, flags); return syscall(__NR_execveat, fd, path, argv, envp, flags);
#else #else
errno = -ENOSYS; errno = ENOSYS;
return -1; return -1;
#endif #endif
} }
...@@ -234,6 +234,14 @@ static int run_tests(void) ...@@ -234,6 +234,14 @@ static int run_tests(void)
int fd_cloexec = open_or_die("execveat", O_RDONLY|O_CLOEXEC); int fd_cloexec = open_or_die("execveat", O_RDONLY|O_CLOEXEC);
int fd_script_cloexec = open_or_die("script", O_RDONLY|O_CLOEXEC); int fd_script_cloexec = open_or_die("script", O_RDONLY|O_CLOEXEC);
/* Check if we have execveat at all, and bail early if not */
errno = 0;
execveat_(-1, NULL, NULL, NULL, 0);
if (errno == ENOSYS) {
printf("[FAIL] ENOSYS calling execveat - no kernel support?\n");
return 1;
}
/* Change file position to confirm it doesn't affect anything */ /* Change file position to confirm it doesn't affect anything */
lseek(fd, 10, SEEK_SET); lseek(fd, 10, SEEK_SET);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment