diff options
| author | Kees Cook <keescook@chromium.org> | 2024-03-13 11:56:10 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2024-03-18 11:19:37 -0700 |
| commit | 0ef58ccb6178b1a40edfd027d8a11a52fa629215 (patch) | |
| tree | 27253031da33527ba02f75a7c1096e16451330af /tools | |
| parent | 1d0e51b24c8383450e631a0110e99d7cf9c4a762 (diff) | |
| download | linux-0ef58ccb6178b1a40edfd027d8a11a52fa629215.tar.gz | |
selftests/exec: execveat: Improve debug reporting
Children processes were reporting their status, duplicating the
parent's. Remove that, and add some additional details about the test
execution.
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Link: https://lore.kernel.org/r/20240313185606.work.073-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/exec/execveat.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index 0546ca24f2b20c..6418ded40bdddc 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c @@ -98,10 +98,9 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags, if (child == 0) { /* Child: do execveat(). */ rc = execveat_(fd, path, argv, envp, flags); - ksft_print_msg("execveat() failed, rc=%d errno=%d (%s)\n", + ksft_print_msg("child execveat() failed, rc=%d errno=%d (%s)\n", rc, errno, strerror(errno)); - ksft_test_result_fail("%s\n", test_name); - exit(1); /* should not reach here */ + exit(errno); } /* Parent: wait for & check child's exit status. */ rc = waitpid(child, &status, 0); @@ -226,11 +225,14 @@ static int check_execveat_pathmax(int root_dfd, const char *src, int is_script) * "If the command name is found, but it is not an executable utility, * the exit status shall be 126."), so allow either. */ - if (is_script) + if (is_script) { + ksft_print_msg("Invoke script via root_dfd and relative filename\n"); fail += check_execveat_invoked_rc(root_dfd, longpath + 1, 0, 127, 126); - else + } else { + ksft_print_msg("Invoke exec via root_dfd and relative filename\n"); fail += check_execveat(root_dfd, longpath + 1, 0); + } return fail; } |