Skip to content

Use closefrom() to close open file descriptors #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Use closefrom() to close open file descriptors #712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions quickjs-libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2997,6 +2997,15 @@ static int my_execvpe(const char *filename, char **argv, char **envp)
return -1;
}

static js_once_t js_os_exec_once = JS_ONCE_INIT;

static void (*js_os_exec_closefrom)(int);

static void js_os_exec_once_init(void)
{
js_os_exec_closefrom = dlsym(RTLD_DEFAULT, "closefrom");
}

/* exec(args[, options]) -> exitcode */
static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
Expand Down Expand Up @@ -3116,15 +3125,17 @@ static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
}
}

// should happen pre-fork because it calls dlsym()
// and that's not an async-signal-safe function
js_once(&js_os_exec_once, js_os_exec_once_init);

pid = fork();
if (pid < 0) {
JS_ThrowTypeError(ctx, "fork error");
goto exception;
}
if (pid == 0) {
/* child */
int fd_max = sysconf(_SC_OPEN_MAX);

/* remap the stdin/stdout/stderr handles if necessary */
for(i = 0; i < 3; i++) {
if (std_fds[i] != i) {
Expand All @@ -3133,8 +3144,14 @@ static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
}
}

for(i = 3; i < fd_max; i++)
close(i);
if (js_os_exec_closefrom) {
js_os_exec_closefrom(3);
} else {
int fd_max = sysconf(_SC_OPEN_MAX);
for(i = 3; i < fd_max; i++)
close(i);
}

if (cwd) {
if (chdir(cwd) < 0)
_exit(127);
Expand Down
Loading