Skip to content

Commit 5b2721c

Browse files
committed
[lldb/Host] Enable inheriting "non-inheritable" FDs
Currently we're creating inheritable (`~FD_CLOEXEC`) file descriptors in the (few) cases where we need to pass an FD to a subprocess. The problem with these is that, in a multithreaded application such as lldb, there's essentially no way to prevent them from being leaked into processes other than the intended one. A safer (though still not completely safe) approach is to mark the descriptors as FD_CLOEXEC and only clear this flag in the subprocess. We currently have something that almost does that, which is the ability to add a `DuplicateFileAction` to our `ProcessLaunchInfo` struct (the duplicated file descriptor will be created with the flag cleared). The problem with *that* is that this approach is completely incompatible with Windows. Windows equivalents of file descriptors are `HANDLE`s, but these do not have user controlled values -- applications are expected to work with whatever HANDLE values are assigned by the OS. In unix terms, there is no equivalent to the `dup2` syscall (only `dup`). To find a way out of this conundrum, and create a miniscule API surface that works uniformly across platforms, this PR proposes to extend the `DuplicateFileAction` API to support duplicating a file descriptor onto itself. Currently, this operation does nothing (it leaves the FD_CLOEXEC flag set), because that's how `dup2(fd, fd)` behaves, but I think it's not completely unreasonable to say that this operation should clear the FD_CLOEXEC flag, just like it would do if one was using different fd values. This would enable us to pass a windows HANDLE as itself through the ProcessLaunchInfo API. This PR implements the unix portion of this idea. Macos and non-macos launchers are updated to clear FD_CLOEXEC flag when duplicating a file descriptor onto itself, and I've created a test which enables passing a FD_CLOEXEC file descritor to the subprocess. For the windows portion, please see the follow-up PR.
1 parent 1563d74 commit 5b2721c

File tree

3 files changed

+59
-3
lines changed

3 files changed

+59
-3
lines changed

lldb/source/Host/macosx/objcxx/Host.mm

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ static bool AddPosixSpawnFileAction(void *_file_actions, const FileAction *info,
11001100
else if (info->GetActionArgument() == -1)
11011101
error = Status::FromErrorString(
11021102
"invalid duplicate fd for posix_spawn_file_actions_adddup2(...)");
1103-
else {
1103+
else if (info->GetFD() != info->GetActionArgument()) {
11041104
error =
11051105
Status(::posix_spawn_file_actions_adddup2(file_actions, info->GetFD(),
11061106
info->GetActionArgument()),
@@ -1110,6 +1110,15 @@ static bool AddPosixSpawnFileAction(void *_file_actions, const FileAction *info,
11101110
"error: {0}, posix_spawn_file_actions_adddup2 "
11111111
"(action={1}, fd={2}, dup_fd={3})",
11121112
error, file_actions, info->GetFD(), info->GetActionArgument());
1113+
} else {
1114+
error =
1115+
Status(::posix_spawn_file_actions_addinherit_np(file_actions, info->GetFD()),
1116+
eErrorTypePOSIX);
1117+
if (error.Fail())
1118+
LLDB_LOG(log,
1119+
"error: {0}, posix_spawn_file_actions_addinherit_np "
1120+
"(action={1}, fd={2})",
1121+
error, file_actions, info->GetFD());
11131122
}
11141123
break;
11151124

lldb/source/Host/posix/ProcessLauncherPosixFork.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "llvm/Support/Errno.h"
1818

1919
#include <climits>
20+
#include <fcntl.h>
2021
#include <sys/ptrace.h>
2122
#include <sys/wait.h>
2223
#include <unistd.h>
@@ -122,8 +123,14 @@ struct ForkLaunchInfo {
122123
ExitWithError(error_fd, "close");
123124
break;
124125
case FileAction::eFileActionDuplicate:
125-
if (dup2(action.fd, action.arg) == -1)
126-
ExitWithError(error_fd, "dup2");
126+
if (action.fd != action.arg) {
127+
if (dup2(action.fd, action.arg) == -1)
128+
ExitWithError(error_fd, "dup2");
129+
} else {
130+
if (fcntl(action.fd, F_SETFD,
131+
fcntl(action.fd, F_GETFD) & ~FD_CLOEXEC) == -1)
132+
ExitWithError(error_fd, "fcntl");
133+
}
127134
break;
128135
case FileAction::eFileActionOpen:
129136
DupDescriptor(error_fd, action.path.c_str(), action.fd, action.arg);

lldb/unittests/Host/HostTest.cpp

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
#include "lldb/Host/Host.h"
1010
#include "TestingSupport/SubsystemRAII.h"
1111
#include "lldb/Host/FileSystem.h"
12+
#include "lldb/Host/Pipe.h"
1213
#include "lldb/Host/ProcessLaunchInfo.h"
1314
#include "lldb/Utility/ProcessInfo.h"
15+
#include "llvm/ADT/Twine.h"
1416
#include "llvm/Support/CommandLine.h"
1517
#include "llvm/Support/FileSystem.h"
1618
#include "llvm/Testing/Support/Error.h"
@@ -87,3 +89,41 @@ TEST(Host, LaunchProcessSetsArgv0) {
8789
ASSERT_THAT_ERROR(Host::LaunchProcess(info).takeError(), Succeeded());
8890
ASSERT_THAT(exit_status.get_future().get(), 0);
8991
}
92+
93+
#ifdef LLVM_ON_UNIX
94+
TEST(Host, LaunchProcessDuplicatesHandle) {
95+
static constexpr llvm::StringLiteral test_msg("Hello subprocess!");
96+
97+
SubsystemRAII<FileSystem> subsystems;
98+
99+
if (test_arg) {
100+
Pipe pipe(LLDB_INVALID_PIPE, (lldb::pipe_t)test_arg.getValue());
101+
llvm::Expected<size_t> bytes_written =
102+
pipe.Write(test_msg.data(), test_msg.size());
103+
if (bytes_written && *bytes_written == test_msg.size())
104+
exit(0);
105+
exit(1);
106+
}
107+
Pipe pipe;
108+
ASSERT_THAT_ERROR(pipe.CreateNew(/*child_process_inherit=*/false).takeError(),
109+
llvm::Succeeded());
110+
ProcessLaunchInfo info;
111+
info.SetExecutableFile(FileSpec(TestMainArgv0),
112+
/*add_exe_file_as_first_arg=*/true);
113+
info.GetArguments().AppendArgument(
114+
"--gtest_filter=Host.LaunchProcessDuplicatesHandle");
115+
info.GetArguments().AppendArgument(
116+
("--test-arg=" + llvm::Twine((uint64_t)pipe.GetWritePipe())).str());
117+
info.AppendDuplicateFileAction((uint64_t)pipe.GetWritePipe(),
118+
(uint64_t)pipe.GetWritePipe());
119+
info.SetMonitorProcessCallback(&ProcessLaunchInfo::NoOpMonitorCallback);
120+
ASSERT_THAT_ERROR(Host::LaunchProcess(info).takeError(), llvm::Succeeded());
121+
pipe.CloseWriteFileDescriptor();
122+
123+
char msg[100];
124+
llvm::Expected<size_t> bytes_read =
125+
pipe.Read(msg, sizeof(msg), std::chrono::seconds(10));
126+
ASSERT_THAT_EXPECTED(bytes_read, llvm::Succeeded());
127+
ASSERT_EQ(llvm::StringRef(msg, *bytes_read), test_msg);
128+
}
129+
#endif

0 commit comments

Comments
 (0)