global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-06 23:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

run-command: add close_fd_above_stderr option

Browse Source 
Add a close_fd_above_stderr flag to struct child_process.  When set,
the child closes file descriptors 3 and above between fork and exec
(skipping the child-notifier pipe), capped at sysconf(_SC_OPEN_MAX)
or 4096, whichever is smaller.  This prevents the child from
inheriting pipe endpoints or other descriptors from the parent
environment (e.g., the test harness).

Signed-off-by: Paul Tarjan <github@paulisageek.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Tarjan
2026-03-05 06:55:08 +00:00
committed by Junio C Hamano
parent 87d6a75010
commit 89e7939fc9
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
run-command.c
View File

@@ -546,6 +546,7 @@ static void atfork_parent(struct atfork_state *as)
"restoring signal mask");
#endif
}
#endif /* GIT_WINDOWS_NATIVE */
static inline void set_cloexec(int fd)
@@ -832,6 +833,17 @@ fail_pipe:
child_close(cmd->out);
}
if (cmd->close_fd_above_stderr) {
long max_fd = sysconf(_SC_OPEN_MAX);
int fd;
if (max_fd < 0 || max_fd > 4096)
max_fd = 4096;
for (fd = 3; fd < max_fd; fd++) {
if (fd != child_notifier)
close(fd);
}
}
if (cmd->dir && chdir(cmd->dir))
child_die(CHILD_ERR_CHDIR);

9
run-command.h
View File

@@ -141,6 +141,15 @@ struct child_process {
unsigned stdout_to_stderr:1;
unsigned clean_on_exit:1;
unsigned wait_after_clean:1;
/**
* Close file descriptors 3 and above in the child after forking
* but before exec. This prevents the child from inheriting
* pipe endpoints or other descriptors from the parent
* environment (e.g., the test harness).
*/
unsigned close_fd_above_stderr:1;
void (*clean_on_exit_handler)(struct child_process *process);
};