diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-19 08:02:52 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-19 16:09:58 +0200 |
commit | a88b8c5c985a87586159c0621974a1dfe5b9b92d (patch) | |
tree | de07afac97f3f3061bd75a13e83576f48284c225 /nix/libstore | |
parent | e53fc0c8a33b1ea4f8503aca899da34ff9ebaa3c (diff) | |
download | gnu-guix-a88b8c5c985a87586159c0621974a1dfe5b9b92d.tar gnu-guix-a88b8c5c985a87586159c0621974a1dfe5b9b92d.tar.gz |
Revert "daemon: Fix possible use-after-free."
This reverts commit 1303a4a4517260def862ce7fe97e6b28dd8005e1.
Diffstat (limited to 'nix/libstore')
-rw-r--r-- | nix/libstore/build.cc | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index b3c994d6de..f38cd29940 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -401,6 +401,18 @@ static void commonChildInit(Pipe & logPipe) } +/* Convert a string list to an array of char pointers. Careful: the + string list should outlive the array. */ +const char * * strings2CharPtrs(const Strings & ss) +{ + const char * * arr = new const char * [ss.size() + 1]; + const char * * p = arr; + foreach (Strings::const_iterator, i, ss) *p++ = i->c_str(); + *p = 0; + return arr; +} + + /* Restore default handling of SIGPIPE, otherwise some programs will randomly say "Broken pipe". */ static void restoreSIGPIPE() @@ -2123,7 +2135,11 @@ void DerivationGoal::initChild() Strings envStrs; foreach (Environment::const_iterator, i, env) envStrs.push_back(rewriteHashes(i->first + "=" + i->second, rewritesToTmp)); - std::vector<const char *> envArr = stringsToCharPtrs(envStrs); + const char * * envArr = strings2CharPtrs(envStrs); + + Path program = drv.builder.c_str(); + std::vector<const char *> args; /* careful with c_str()! */ + string user; /* must be here for its c_str()! */ /* If we are running in `build-users' mode, then switch to the user we allocated above. Make sure that we drop all root @@ -2149,18 +2165,17 @@ void DerivationGoal::initChild() } /* Fill in the arguments. */ - Strings args; string builderBasename = baseNameOf(drv.builder); args.push_back(builderBasename.c_str()); foreach (Strings::iterator, i, drv.args) - args.push_back(rewriteHashes(*i, rewritesToTmp)); - std::vector<const char *> argArr = stringsToCharPtrs(args); + args.push_back(rewriteHashes(*i, rewritesToTmp).c_str()); + args.push_back(0); restoreSIGPIPE(); /* Execute the program. This should not return. */ inSetup = false; - execve(drv.builder.c_str(), (char * *) &argArr[0], (char * *) &envArr[0]); + execve(program.c_str(), (char * *) &args[0], (char * *) envArr); throw SysError(format("executing `%1%'") % drv.builder); @@ -2763,7 +2778,7 @@ void SubstitutionGoal::tryToRun() args.push_back("--substitute"); args.push_back(storePath); args.push_back(destPath); - std::vector<const char *> argArr = stringsToCharPtrs(args); + const char * * argArr = strings2CharPtrs(args); /* Fork the substitute program. */ pid = maybeVfork(); @@ -2781,7 +2796,7 @@ void SubstitutionGoal::tryToRun() if (dup2(outPipe.writeSide, STDOUT_FILENO) == -1) throw SysError("cannot dup output pipe into stdout"); - execv(sub.c_str(), (char * *) &argArr[0]); + execv(sub.c_str(), (char * *) argArr); throw SysError(format("executing `%1%'") % sub); |