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

Adds namespace flag checks to userns setup. 

Signed-off-by: Mrunal Patel <mrunalp@gmail.com> (github: mrunalp)
This commit is contained in:
Mrunal Patel 2015-01-20 13:26:59 -05:00
parent 107bad0ee5
commit bde8bf2ebc
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
namespaces/execin.go
View File

@ -152,12 +152,19 @@ func SetupContainer(container *libcontainer.Config, dataPath, uncleanRootfs, con
return fmt.Errorf("unable to read state: %s", err) return fmt.Errorf("unable to read state: %s", err)
} }
if err := setupNetwork(container, &state.NetworkState); err != nil { cloneFlags := GetNamespaceFlags(container.Namespaces)
return fmt.Errorf("setup networking %s", err)
}
if err := setupRoute(container); err != nil { if (cloneFlags & syscall.CLONE_NEWNET) == 0 {
return fmt.Errorf("setup route %s", err) if len(container.Networks) != 0 || len(container.Routes) != 0 {
return fmt.Errorf("unable to apply network parameters without network namespace")
}
} else {
if err := setupNetwork(container, &state.NetworkState); err != nil {
return fmt.Errorf("setup networking %s", err)
}
if err := setupRoute(container); err != nil {
return fmt.Errorf("setup route %s", err)
}
} }
label.Init() label.Init()
@ -172,7 +179,12 @@ func SetupContainer(container *libcontainer.Config, dataPath, uncleanRootfs, con
return fmt.Errorf("failed to get hostRootGid %s", err) return fmt.Errorf("failed to get hostRootGid %s", err)
} }
if err := mount.InitializeMountNamespace(rootfs, // InitializeMountNamespace() can be executed only for a new mount namespace
if (cloneFlags & syscall.CLONE_NEWNS) == 0 {
if container.MountConfig != nil {
return fmt.Errorf("mount config is set without mount namespace")
}
} else if err := mount.InitializeMountNamespace(rootfs,
consolePath, consolePath,
container.RestrictSys, container.RestrictSys,
hostRootUid, hostRootUid,