fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-04 21:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed fd close order in ExecFile.

Browse Source
This commit is contained in:
Jari Sundell
2026-07-06 11:06:51 +02:00
committed by GitHub
parent 0494ce70c8
commit a07f57a703
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/exec_file.cc
+26 -24
View File
@@ -8,6 +8,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <torrent/net/fd.h>
#include <torrent/system/system.h>
#include <torrent/system/thread.h> #include <torrent/system/thread.h>
#include "exec_file.h" #include "exec_file.h"
@@ -46,19 +48,11 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
posix_spawnattr_t attr; posix_spawnattr_t attr;
posix_spawnattr_init(&attr); posix_spawnattr_init(&attr);
short spawn_flags = 0;
// Try to avoid leaking open fds to the spawned process. Prefer POSIX_SPAWN_CLOEXEC_DEFAULT // Try to avoid leaking open fds to the spawned process. Prefer POSIX_SPAWN_CLOEXEC_DEFAULT
// (macOS-only) or posix_spawn_file_actions_addclosefrom_np (glibc >= 2.34, FreeBSD >= 13.1). // (macOS-only) or posix_spawn_file_actions_addclosefrom_np (glibc >= 2.34, FreeBSD >= 13.1).
// //
// Other platforms like musl libc, OpenBSD and NetBSD must rely on explicit O_CLOEXEC. // Other platforms like musl libc, OpenBSD and NetBSD must rely on explicit O_CLOEXEC.
#if defined(POSIX_SPAWN_CLOEXEC_DEFAULT)
spawn_flags |= POSIX_SPAWN_CLOEXEC_DEFAULT;
#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP)
posix_spawn_file_actions_addclosefrom_np(&actions, 3);
#endif
// Handle standard input redirection (/dev/null), posix_spawn_file_actions_addopen handles opening // Handle standard input redirection (/dev/null), posix_spawn_file_actions_addopen handles opening
// and dup2 natively // and dup2 natively
if (posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDWR, 0) != 0) { if (posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDWR, 0) != 0) {
@@ -66,18 +60,18 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
posix_spawn_file_actions_addclose(&actions, 0); posix_spawn_file_actions_addclose(&actions, 0);
} }
int pipe_fd[2] = {-1, -1}; int pipe_0 = -1;
int pipe_1 = -1;
if ((flags & flag_capture) && pipe(pipe_fd))
throw torrent::input_error("ExecFile::execute(...) Pipe creation failed.");
// Handle standard output redirection // Handle standard output redirection
if (flags & flag_capture) { if (flags & flag_capture) {
posix_spawn_file_actions_adddup2(&actions, pipe_fd[1], 1); torrent::fd_open_pipe(pipe_0, pipe_1);
posix_spawn_file_actions_adddup2(&actions, pipe_1, 1);
// Ensure the write end of the pipe is closed in the child after duplicating. // Ensure the write end of the pipe is closed in the child after duplicating.
posix_spawn_file_actions_addclose(&actions, pipe_fd[1]); posix_spawn_file_actions_addclose(&actions, pipe_0);
posix_spawn_file_actions_addclose(&actions, pipe_fd[0]); posix_spawn_file_actions_addclose(&actions, pipe_1);
} else if (m_log_fd != -1) { } else if (m_log_fd != -1) {
posix_spawn_file_actions_adddup2(&actions, m_log_fd, 1); posix_spawn_file_actions_adddup2(&actions, m_log_fd, 1);
@@ -92,6 +86,14 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
posix_spawn_file_actions_addopen(&actions, 2, "/dev/null", O_RDWR, 0); posix_spawn_file_actions_addopen(&actions, 2, "/dev/null", O_RDWR, 0);
} }
short spawn_flags = 0;
#if defined(POSIX_SPAWN_CLOEXEC_DEFAULT)
spawn_flags |= POSIX_SPAWN_CLOEXEC_DEFAULT;
#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP)
posix_spawn_file_actions_addclosefrom_np(&actions, 3);
#endif
if (flags & flag_background) { if (flags & flag_background) {
#ifdef POSIX_SPAWN_SETSID #ifdef POSIX_SPAWN_SETSID
spawn_flags |= POSIX_SPAWN_SETSID; spawn_flags |= POSIX_SPAWN_SETSID;
@@ -110,31 +112,31 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
posix_spawnattr_destroy(&attr); posix_spawnattr_destroy(&attr);
if (spawn_status != 0) { if (spawn_status != 0) {
if (pipe_fd[0] != -1) if (pipe_0 != -1)
::close(pipe_fd[0]); torrent::fd_close(pipe_0);
if (pipe_fd[1] != -1) if (pipe_1 != -1)
::close(pipe_fd[1]); torrent::fd_close(pipe_1);
throw torrent::input_error("ExecFile::execute(...) posix_spawn failed: " + std::string(std::strerror(spawn_status))); throw torrent::input_error("ExecFile::execute() posix_spawn failed: " + torrent::system::errno_enum_str(spawn_status));
} }
if (flags & flag_capture) { if (flags & flag_capture) {
m_capture = std::string(); m_capture = std::string();
::close(pipe_fd[1]); torrent::fd_close(pipe_1);
char buffer[4096]; char buffer[4096];
ssize_t length; ssize_t length;
do { do {
length = read(pipe_fd[0], buffer, sizeof(buffer)); length = read(pipe_0, buffer, sizeof(buffer));
if (length > 0) if (length > 0)
m_capture += std::string(buffer, length); m_capture += std::string(buffer, length);
} while (length > 0); } while (length > 0);
::close(pipe_fd[0]); torrent::fd_close(pipe_0);
if (m_log_fd != -1) { if (m_log_fd != -1) {
result = write(m_log_fd, "Captured output:\n", sizeof("Captured output:\n")); result = write(m_log_fd, "Captured output:\n", sizeof("Captured output:\n"));
@@ -151,7 +153,7 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
int status; int status;
while (waitpid(child_pid, &status, 0) == -1) { while (::waitpid(child_pid, &status, 0) == -1) {
switch (errno) { switch (errno) {
case EINTR: case EINTR:
continue; continue;