summaryrefslogtreecommitdiffhomepage
path: root/runsc/specutils/namespace.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2019-03-18 12:29:43 -0700
committerShentubot <shentubot@google.com>2019-03-18 12:30:43 -0700
commite420cc3e5d2066674d32d16ad885bee6b30da210 (patch)
tree991b119af7c8816a539318560338b3e5f065a2f8 /runsc/specutils/namespace.go
parenteb69542807a87491fd4e6405bdab1c0f64db536d (diff)
Add support for mount propagation
Properly handle propagation options for root and mounts. Now usage of mount options shared, rshared, and noexec cause error to start. shared/ rshared breaks sandbox=>host isolation. slave however can be supported because changes propagate from host to sandbox. Root FS setup moved inside the gofer. Apart from simplifying the code, it keeps all mounts inside the namespace. And they are torn down when the namespace is destroyed (DestroyFS is no longer needed). PiperOrigin-RevId: 239037661 Change-Id: I8b5ee4d50da33c042ea34fa68e56514ebe20e6e0
Diffstat (limited to 'runsc/specutils/namespace.go')
-rw-r--r--runsc/specutils/namespace.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/runsc/specutils/namespace.go b/runsc/specutils/namespace.go
index 73fab13e1..35da789f4 100644
--- a/runsc/specutils/namespace.go
+++ b/runsc/specutils/namespace.go
@@ -105,9 +105,9 @@ func FilterNS(filter []specs.LinuxNamespaceType, s *specs.Spec) []specs.LinuxNam
return out
}
-// SetNS sets the namespace of the given type. It must be called with
+// setNS sets the namespace of the given type. It must be called with
// OSThreadLocked.
-func SetNS(fd, nsType uintptr) error {
+func setNS(fd, nsType uintptr) error {
if _, _, err := syscall.RawSyscall(unix.SYS_SETNS, fd, nsType, 0); err != 0 {
return err
}
@@ -119,30 +119,30 @@ func SetNS(fd, nsType uintptr) error {
//
// Preconditions: Must be called with os thread locked.
func ApplyNS(ns specs.LinuxNamespace) (func(), error) {
- log.Infof("applying namespace %v at path %q", ns.Type, ns.Path)
+ log.Infof("Applying namespace %v at path %q", ns.Type, ns.Path)
newNS, err := os.Open(ns.Path)
if err != nil {
return nil, fmt.Errorf("error opening %q: %v", ns.Path, err)
}
defer newNS.Close()
- // Store current netns to restore back after child is started.
+ // Store current namespace to restore back.
curPath := nsPath(ns.Type)
oldNS, err := os.Open(curPath)
if err != nil {
return nil, fmt.Errorf("error opening %q: %v", curPath, err)
}
- // Set netns to the one requested and setup function to restore it back.
+ // Set namespace to the one requested and setup function to restore it back.
flag := nsCloneFlag(ns.Type)
- if err := SetNS(newNS.Fd(), flag); err != nil {
+ if err := setNS(newNS.Fd(), flag); err != nil {
oldNS.Close()
return nil, fmt.Errorf("error setting namespace of type %v and path %q: %v", ns.Type, ns.Path, err)
}
return func() {
- log.Infof("restoring namespace %v", ns.Type)
+ log.Infof("Restoring namespace %v", ns.Type)
defer oldNS.Close()
- if err := SetNS(oldNS.Fd(), flag); err != nil {
+ if err := setNS(oldNS.Fd(), flag); err != nil {
panic(fmt.Sprintf("error restoring namespace: of type %v: %v", ns.Type, err))
}
}, nil