opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-08 14:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2569 from giuseppe/rootless-fix-exec-with-user

Browse Source 
rootless: exec join the user+mount namespace
This commit is contained in:
OpenShift Merge Robot
2019-03-08 08:22:55 -08:00
committed by GitHub
parent 90319bcf52 081291c8d6
commit c4815e8a61
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/podman/create.go
View File

@@ -893,7 +893,16 @@ func joinOrCreateRootlessUserNamespace(createConfig *cc.CreateConfig, runtime *l
} }
return false, -1, errors.Errorf("dependency container %s is not running", ctr.ID()) return false, -1, errors.Errorf("dependency container %s is not running", ctr.ID())
} }
return rootless.JoinNS(uint(pid), 0)
data, err := ioutil.ReadFile(ctr.Config().ConmonPidFile)
if err != nil {
return false, -1, errors.Wrapf(err, "cannot read conmon PID file %q", ctr.Config().ConmonPidFile)
}
conmonPid, err := strconv.Atoi(string(data))
if err != nil {
return false, -1, errors.Wrapf(err, "cannot parse PID %q", data)
}
return rootless.JoinDirectUserAndMountNS(uint(conmonPid))
} }
} }
return rootless.BecomeRootInUserNS() return rootless.BecomeRootInUserNS()

29
cmd/podman/exec.go
View File

@@ -106,16 +106,25 @@ func execCmd(c *cliconfig.ExecValues) error {
} }
pid, err := ctr.PID() if os.Geteuid() != 0 {
if err != nil { var became bool
return err var ret int
}
became, ret, err := rootless.JoinNS(uint(pid), c.PreserveFDs) data, err := ioutil.ReadFile(ctr.Config().ConmonPidFile)
if err != nil { if err != nil {
return err return errors.Wrapf(err, "cannot read conmon PID file %q", ctr.Config().ConmonPidFile)
} }
if became { conmonPid, err := strconv.Atoi(string(data))
os.Exit(ret) if err != nil {
return errors.Wrapf(err, "cannot parse PID %q", data)
}
became, ret, err = rootless.JoinDirectUserAndMountNS(uint(conmonPid))
if err != nil {
return err
}
if became {
os.Exit(ret)
}
} }
// ENVIRONMENT VARIABLES // ENVIRONMENT VARIABLES