diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-09T14·15+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-09T14·37+0200 |
commit | 202683a4fc148dc228de226e9980a3f27754b854 (patch) | |
tree | dd75cf8f873a913ac3baf222eb93981622407d5f /src/libstore/local-store.cc | |
parent | 9bdd949cfdc9e49f1e01460a2a73215cac3ec904 (diff) |
Use O_CLOEXEC in most places
Diffstat (limited to 'src/libstore/local-store.cc')
-rw-r--r-- | src/libstore/local-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 67da5c1cfaab..409eb1a8aaa3 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -117,7 +117,7 @@ LocalStore::LocalStore(const Params & params) if (stat(reservedPath.c_str(), &st) == -1 || st.st_size != settings.reservedSize) { - AutoCloseFD fd = open(reservedPath.c_str(), O_WRONLY | O_CREAT, 0600); + AutoCloseFD fd = open(reservedPath.c_str(), O_WRONLY | O_CREAT | O_CLOEXEC, 0600); int res = -1; #if HAVE_POSIX_FALLOCATE res = posix_fallocate(fd, 0, settings.reservedSize); @@ -1245,7 +1245,7 @@ static void makeMutable(const Path & path) /* The O_NOFOLLOW is important to prevent us from changing the mutable bit on the target of a symlink (which would be a security hole). */ - AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_NOFOLLOW); + AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_NOFOLLOW | O_CLOEXEC); if (fd == -1) { if (errno == ELOOP) return; // it's a symlink throw SysError(format("opening file ‘%1%’") % path); |