Commit 0ef58ccb authored by Kees Cook's avatar Kees Cook

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: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Link: https://lore.kernel.org/r/20240313185606.work.073-kees@kernel.orgSigned-off-by: default avatarKees Cook <keescook@chromium.org>
parent 1d0e51b2
...@@ -98,10 +98,9 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags, ...@@ -98,10 +98,9 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags,
if (child == 0) { if (child == 0) {
/* Child: do execveat(). */ /* Child: do execveat(). */
rc = execveat_(fd, path, argv, envp, flags); 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)); rc, errno, strerror(errno));
ksft_test_result_fail("%s\n", test_name); exit(errno);
exit(1); /* should not reach here */
} }
/* Parent: wait for & check child's exit status. */ /* Parent: wait for & check child's exit status. */
rc = waitpid(child, &status, 0); rc = waitpid(child, &status, 0);
...@@ -226,11 +225,14 @@ static int check_execveat_pathmax(int root_dfd, const char *src, int is_script) ...@@ -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, * "If the command name is found, but it is not an executable utility,
* the exit status shall be 126."), so allow either. * 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, fail += check_execveat_invoked_rc(root_dfd, longpath + 1, 0,
127, 126); 127, 126);
else } else {
ksft_print_msg("Invoke exec via root_dfd and relative filename\n");
fail += check_execveat(root_dfd, longpath + 1, 0); fail += check_execveat(root_dfd, longpath + 1, 0);
}
return fail; return fail;
} }
......
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