diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-02 22:53:08 -0500 |
---|---|---|
committer | Shuah Khan <shuahkh@osg.samsung.com> | 2015-03-11 12:15:19 -0400 |
commit | 9a0b57451ae8142c74d65bddb6d7765818babbed (patch) | |
tree | 39b95b227b7a917319267520370381c77edb9e4c /tools | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) |
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: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: David Drysdale <drysdale@google.com>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/exec/execveat.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index e238c9559caf..8d5d1d2ee7c1 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c | |||
@@ -30,7 +30,7 @@ static int execveat_(int fd, const char *path, char **argv, char **envp, | |||
30 | #ifdef __NR_execveat | 30 | #ifdef __NR_execveat |
31 | return syscall(__NR_execveat, fd, path, argv, envp, flags); | 31 | return syscall(__NR_execveat, fd, path, argv, envp, flags); |
32 | #else | 32 | #else |
33 | errno = -ENOSYS; | 33 | errno = ENOSYS; |
34 | return -1; | 34 | return -1; |
35 | #endif | 35 | #endif |
36 | } | 36 | } |
@@ -234,6 +234,14 @@ static int run_tests(void) | |||
234 | int fd_cloexec = open_or_die("execveat", O_RDONLY|O_CLOEXEC); | 234 | int fd_cloexec = open_or_die("execveat", O_RDONLY|O_CLOEXEC); |
235 | int fd_script_cloexec = open_or_die("script", O_RDONLY|O_CLOEXEC); | 235 | int fd_script_cloexec = open_or_die("script", O_RDONLY|O_CLOEXEC); |
236 | 236 | ||
237 | /* Check if we have execveat at all, and bail early if not */ | ||
238 | errno = 0; | ||
239 | execveat_(-1, NULL, NULL, NULL, 0); | ||
240 | if (errno == ENOSYS) { | ||
241 | printf("[FAIL] ENOSYS calling execveat - no kernel support?\n"); | ||
242 | return 1; | ||
243 | } | ||
244 | |||
237 | /* Change file position to confirm it doesn't affect anything */ | 245 | /* Change file position to confirm it doesn't affect anything */ |
238 | lseek(fd, 10, SEEK_SET); | 246 | lseek(fd, 10, SEEK_SET); |
239 | 247 | ||