libcontainer: use ParseSocketControlMessage/ParseUnixRights from x/sys/unix

tklauser · tklauser · commit 54d27bed7f1b · 2017-07-13T15:02:17.000+02:00
Use ParseSocketControlMessage and ParseUnixRights from
golang.org/x/sys/unix instead of their syscall equivalent.

Signed-off-by: Tobias Klauser &lt;tklauser@distanz.ch&gt;
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -1290,11 +1290,11 @@ func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Proc
 			}
 		}
 	case notify.GetScript() == "orphan-pts-master":
-		scm, err := syscall.ParseSocketControlMessage(oob)
+		scm, err := unix.ParseSocketControlMessage(oob)
 		if err != nil {
 			return err
 		}
-		fds, err := syscall.ParseUnixRights(&scm[0])
+		fds, err := unix.ParseUnixRights(&scm[0])
 
 		master := os.NewFile(uintptr(fds[0]), "orphan-pts-master")
 		defer master.Close()

Original file line number	Diff line number	Diff line change
`@@ -1290,11 +1290,11 @@ func (c linuxContainer) criuNotifications(resp criurpc.CriuResp, process *Proc`
`1290`	`1290`	`}`
`1291`	`1291`	`}`
`1292`	`1292`	`case notify.GetScript() == "orphan-pts-master":`
`1293`		`- scm, err := syscall.ParseSocketControlMessage(oob)`
	`1293`	`+ scm, err := unix.ParseSocketControlMessage(oob)`
`1294`	`1294`	`if err != nil {`
`1295`	`1295`	`return err`
`1296`	`1296`	`}`
`1297`		`- fds, err := syscall.ParseUnixRights(&scm[0])`
	`1297`	`+ fds, err := unix.ParseUnixRights(&scm[0])`
`1298`	`1298`
`1299`	`1299`	`master := os.NewFile(uintptr(fds[0]), "orphan-pts-master")`
`1300`	`1300`	`defer master.Close()`