libcontainer: drop system.Setxid

Since Go 1.16, [Go issue 1435][1] is solved, and the stdlib syscall implementations work on Linux. While they are a bit more flexible/heavier-weight than the implementations that were copied to libcontainer/system (working across all threads), we compile with Cgo, and using the libc wrappers should be just as suitable. [1]: golang/go#1435 Signed-off-by: Bjorn Neergaard <[email protected]>
neersighted · Oct 11, 2023 · 22de49f · 22de49f
1 parent 520a3d5
commit 22de49f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 56 deletions.
diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go
@@ -11,6 +11,7 @@ import (
 	"runtime/debug"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/containerd/console"
 	"github.com/moby/sys/user"
@@ -525,10 +526,10 @@ func setupUser(config *initConfig) error {
 		}
 	}
 
-	if err := system.Setgid(execUser.Gid); err != nil {
+	if err := syscall.Setgid(execUser.Gid); err != nil {
 		return err
 	}
-	if err := system.Setuid(execUser.Uid); err != nil {
+	if err := syscall.Setuid(execUser.Uid); err != nil {
 		return err
 	}
 

diff --git a/libcontainer/system/syscall_linux_32.go b/libcontainer/system/syscall_linux_32.go
diff --git a/libcontainer/system/syscall_linux_64.go b/libcontainer/system/syscall_linux_64.go