Skip to contentSkip to conversation

utils.c: get_available_ptests fix security flags compilation

PATCH New Anibal Limon 1 participant 2 messages Jan 27, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 utils.c: get_available_ptests fix security flags compilation

When get_available_ptests uses realpath to support symlinks, this is expected to not fail because usage of stack memory, if fails prints the error and exit.

---
 utils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
utils.c +4 -1
index 59b8b77..54394cc 100644
@@ -118,7 +118,10 @@ get_available_ptests(const char *dir)
 	int saved_errno = -1; /* Initalize to invalid errno. */
 	char realdir[PATH_MAX];
 
-	realpath(dir, realdir);
+	if (realpath(dir, realdir) == NULL) {
+		fprintf(stderr, "ERROR: get_available_ptests failed to get realpath, %s\n", strerror(errno));
+		exit(1);
+	}
 
 	do
 	{
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 utils: run_child fix security flags build

Move chdir outside run_child to better handle when fails output an error message plus remove the need to strdup inside run_child (already have ptest_dir).

---
 utils.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
utils.c +5 -2
index 54394cc..472520f 100644
@@ -327,7 +327,6 @@ static inline void
 run_child(char *run_ptest, int fd_stdout, int fd_stderr)
 {
 	char *const argv[2] = {run_ptest, NULL};
-	chdir(dirname(strdup(run_ptest)));
 
 	dup2(fd_stdout, STDOUT_FILENO);
 	// XXX: Redirect stderr to stdout to avoid buffer ordering problems.
@@ -466,7 +465,11 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
 					fprintf(fp, "ERROR: Unable to attach to controlling tty, %s\n", strerror(errno));
 				}
 
-				run_child(p->run_ptest, pipefd_stdout[PIPE_WRITE], pipefd_stderr[PIPE_WRITE]);
+				if (chdir(ptest_dir) == -1) {
+					fprintf(fp, "ERROR: Unable to chdir(%s), %s\n", ptest_dir, strerror(errno));
+				} else {
+					run_child(p->run_ptest, pipefd_stdout[PIPE_WRITE], pipefd_stderr[PIPE_WRITE]);
+				}
 
 			} else {
 				bool timedout = false;
Signature · 1 line
2.43.0