cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #6348 from cole-h/fix-restoring-mount-namespace

Browse source 
libutil: Fix restoring mount namespace
This commit is contained in:
Eelco Dolstra 2022-04-07 18:15:33 +02:00 committed by GitHub
commit 8b1e328d5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libutil/util.cc
View file

@ -1692,7 +1692,9 @@ void setStackSize(size_t stackSize)
#endif #endif
} }
#if __linux__
static AutoCloseFD fdSavedMountNamespace; static AutoCloseFD fdSavedMountNamespace;
#endif
void saveMountNamespace() void saveMountNamespace()
{ {
@ -1711,8 +1713,13 @@ void restoreMountNamespace()
{ {
#if __linux__ #if __linux__
try { try {
auto savedCwd = absPath(".");
if (fdSavedMountNamespace && setns(fdSavedMountNamespace.get(), CLONE_NEWNS) == -1) if (fdSavedMountNamespace && setns(fdSavedMountNamespace.get(), CLONE_NEWNS) == -1)
throw SysError("restoring parent mount namespace"); throw SysError("restoring parent mount namespace");
if (chdir(savedCwd.c_str()) == -1) {
throw SysError("restoring cwd");
}
} catch (Error & e) { } catch (Error & e) {
debug(e.msg()); debug(e.msg());
} }