jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge branch 'pr-1500' 

rootfs: switch ms_private remount of oldroot to ms_slave

LGTMs: @crosbymichael @hqhq
Closes opencontainers/runc#1500
This commit is contained in:
Aleksa Sarai 2017-10-14 09:32:59 +11:00
parent 7c7d38bfe8 117c92745b
commit 2430a98e64
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcontainer/rootfs_linux.go
View File

@ -678,9 +678,12 @@ func pivotRoot(rootfs string) error {
return err return err
} }
// Make oldroot rprivate to make sure our unmounts don't propagate to the // Make oldroot rslave to make sure our unmounts don't propagate to the
// host (and thus bork the machine). // host (and thus bork the machine). We don't use rprivate because this is
if err := unix.Mount("", ".", "", unix.MS_PRIVATE|unix.MS_REC, ""); err != nil { // known to cause issues due to races where we still have a reference to a
// mount while a process in the host namespace are trying to operate on
// something they think has no mounts (devicemapper in particular).
if err := unix.Mount("", ".", "", unix.MS_SLAVE|unix.MS_REC, ""); err != nil {
return err return err
} }
// Preform the unmount. MNT_DETACH allows us to unmount /proc/self/cwd. // Preform the unmount. MNT_DETACH allows us to unmount /proc/self/cwd.