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

Merge pull request #1519 from tklauser/moar-unix 

libcontainer: use additional functions and constants from x/sys/unix
This commit is contained in:
Daniel, Dao Quang Minh 2017-07-17 10:07:22 +01:00 committed by GitHub
parent 825b5c020a 4019833d46
commit 7ab4f43a4b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/container_linux.go
View File

@ -1290,11 +1290,11 @@ func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Proc
} }
} }
case notify.GetScript() == "orphan-pts-master": case notify.GetScript() == "orphan-pts-master":
scm, err := syscall.ParseSocketControlMessage(oob) scm, err := unix.ParseSocketControlMessage(oob)
if err != nil { if err != nil {
return err return err
} }
fds, err := syscall.ParseUnixRights(&scm[0]) fds, err := unix.ParseUnixRights(&scm[0])
master := os.NewFile(uintptr(fds[0]), "orphan-pts-master") master := os.NewFile(uintptr(fds[0]), "orphan-pts-master")
defer master.Close() defer master.Close()

2
libcontainer/setns_init_linux.go
View File

@ -43,7 +43,7 @@ func (l *linuxSetnsInit) Init() error {
} }
} }
if l.config.NoNewPrivileges { if l.config.NoNewPrivileges {
if err := unix.Prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); err != nil { if err := unix.Prctl(unix.PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); err != nil {
return err return err
} }
} }

6
libcontainer/standard_init_linux.go
View File

@ -42,10 +42,6 @@ func (l *linuxStandardInit) getSessionRingParams() (string, uint32, uint32) {
return fmt.Sprintf("_ses.%s", l.config.ContainerId), 0xffffffff, newperms return fmt.Sprintf("_ses.%s", l.config.ContainerId), 0xffffffff, newperms
} }
// PR_SET_NO_NEW_PRIVS isn't exposed in Golang so we define it ourselves copying the value
// the kernel
const PR_SET_NO_NEW_PRIVS = 0x26
func (l *linuxStandardInit) Init() error { func (l *linuxStandardInit) Init() error {
if !l.config.Config.NoNewKeyring { if !l.config.Config.NoNewKeyring {
ringname, keepperms, newperms := l.getSessionRingParams() ringname, keepperms, newperms := l.getSessionRingParams()
@ -128,7 +124,7 @@ func (l *linuxStandardInit) Init() error {
return err return err
} }
if l.config.NoNewPrivileges { if l.config.NoNewPrivileges {
if err := unix.Prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); err != nil { if err := unix.Prctl(unix.PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); err != nil {
return err return err
} }
} }