echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

execute_process: Restore CLOEXEC on OUTPUT_FILE and ERROR_FILE descriptors

Browse Source 
Since commit 5420639a8d (cmExecuteProcessCommand: Replace cmsysProcess
with cmUVProcessChain, 2023-06-01, v3.28.0-rc1~138^2~8), the descriptors
for the `OUTPUT_FILE` and `ERROR_FILE` leak to child processes.

With `ExternalProject` + `INSTALL_COMMAND` + `LOG_INSTALL`, the logging
wrapper script leaks the log files' descriptors to the native build
tool.  If they happen to match the `make` job server's pipe fds, e.g.,
with GNU `make` <= 4.3, then the build fails with an error like:

    gmake[4]: *** read jobs pipe: Bad file descriptor.  Stop.

Fixes: #26398
This commit is contained in:
Brad King 2024-11-19 09:02:57 -05:00
parent d1d20ed397
commit 60af429c5d
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmExecuteProcessCommand.cxx
View File

@ -17,6 +17,12 @@
#include <cm3p/uv.h> #include <cm3p/uv.h>
#ifndef _WIN32
# include <fcntl.h>
# include "cm_fileno.hxx"
#endif
#include "cmArgumentParser.h" #include "cmArgumentParser.h"
#include "cmExecutionStatus.h" #include "cmExecutionStatus.h"
#include "cmList.h" #include "cmList.h"
@ -35,6 +41,20 @@ bool cmExecuteProcessCommandIsWhitespace(char c)
return (cmIsSpace(c) || c == '\n' || c == '\r'); return (cmIsSpace(c) || c == '\n' || c == '\r');
} }
FILE* FopenCLOEXEC(std::string const& path, const char* mode)
{
FILE* f = cmsys::SystemTools::Fopen(path, mode);
#ifndef _WIN32
if (f) {
if (fcntl(cm_fileno(f), F_SETFD, FD_CLOEXEC) < 0) {
fclose(f);
f = nullptr;
}
}
#endif
return f;
}
void cmExecuteProcessCommandFixText(std::vector<char>& output, void cmExecuteProcessCommandFixText(std::vector<char>& output,
bool strip_trailing_whitespace); bool strip_trailing_whitespace);
void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data, void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data,
@ -178,7 +198,7 @@ bool cmExecuteProcessCommand(std::vector<std::string> const& args,
// Check the output variables. // Check the output variables.
std::unique_ptr<FILE, int (*)(FILE*)> inputFile(nullptr, fclose); std::unique_ptr<FILE, int (*)(FILE*)> inputFile(nullptr, fclose);
if (!inputFilename.empty()) { if (!inputFilename.empty()) {
inputFile.reset(cmsys::SystemTools::Fopen(inputFilename, "rb")); inputFile.reset(FopenCLOEXEC(inputFilename, "rb"));
if (inputFile) { if (inputFile) {
builder.SetExternalStream(cmUVProcessChainBuilder::Stream_INPUT, builder.SetExternalStream(cmUVProcessChainBuilder::Stream_INPUT,
inputFile.get()); inputFile.get());
@ -189,7 +209,7 @@ bool cmExecuteProcessCommand(std::vector<std::string> const& args,
std::unique_ptr<FILE, int (*)(FILE*)> outputFile(nullptr, fclose); std::unique_ptr<FILE, int (*)(FILE*)> outputFile(nullptr, fclose);
if (!outputFilename.empty()) { if (!outputFilename.empty()) {
outputFile.reset(cmsys::SystemTools::Fopen(outputFilename, "wb")); outputFile.reset(FopenCLOEXEC(outputFilename, "wb"));
if (outputFile) { if (outputFile) {
builder.SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, builder.SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT,
outputFile.get()); outputFile.get());
@ -211,7 +231,7 @@ bool cmExecuteProcessCommand(std::vector<std::string> const& args,
outputFile.get()); outputFile.get());
} }
} else { } else {
errorFile.reset(cmsys::SystemTools::Fopen(errorFilename, "wb")); errorFile.reset(FopenCLOEXEC(errorFilename, "wb"));
if (errorFile) { if (errorFile) {
builder.SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, builder.SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR,
errorFile.get()); errorFile.get());