From 807f6f8d8f98422cfcfe7e474e26a985d951af4d Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 31 Aug 2018 09:31:34 +0200 Subject: rootless: check uid with Geteuid() instead of Getuid() change the tests to use chroot to set a numeric UID/GID. Go syscall.Credential doesn't change the effective UID/GID of the process. Signed-off-by: Giuseppe Scrivano Closes: #1372 Approved by: mheon --- libpod/oci_linux.go | 2 +- libpod/runtime.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libpod') diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 335a7eec3..210ba57d1 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -20,7 +20,7 @@ import ( ) func (r *OCIRuntime) moveConmonToCgroup(ctr *Container, cgroupParent string, cmd *exec.Cmd) error { - if os.Getuid() == 0 { + if os.Geteuid() == 0 { if r.cgroupManager == SystemdCgroupsManager { unitName := createUnitName("libpod-conmon", ctr.ID()) diff --git a/libpod/runtime.go b/libpod/runtime.go index da5d9fa70..c405eb773 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -561,7 +561,7 @@ func makeRuntime(runtime *Runtime) (err error) { // empty state only creates a single file // As such, it's not really a performance concern if os.IsNotExist(err) { - if os.Getuid() != 0 { + if os.Geteuid() != 0 { aliveLock.Unlock() locked = false if err2 := runtime.refreshRootless(); err2 != nil { -- cgit v1.2.3-54-g00ecf