Merge pull request #72 from giuseppe/fix-huser-rootless

psgo: use the host process to read uids/gids
containers · Jun 1, 2020 · 1082112 · 1082112
2 parents fe6129b + a083b59
commit 1082112
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/psgo.go b/psgo.go
@@ -847,7 +847,7 @@ func processHPID(p *process.Process, ctx *psContext) (string, error) {
 func processHUSER(p *process.Process, ctx *psContext) (string, error) {
 	if hp := findHostProcess(p, ctx); hp != nil {
 		if ctx.opts != nil && len(ctx.opts.UIDMap) > 0 {
-			return findID(p.Status.Uids[1], ctx.opts.UIDMap, process.LookupUID, "/proc/sys/fs/overflowuid")
+			return findID(hp.Status.Uids[1], ctx.opts.UIDMap, process.LookupUID, "/proc/sys/fs/overflowuid")
 		}
 		return hp.Huser, nil
 	}
@@ -860,7 +860,7 @@ func processHUSER(p *process.Process, ctx *psContext) (string, error) {
 func processHGROUP(p *process.Process, ctx *psContext) (string, error) {
 	if hp := findHostProcess(p, ctx); hp != nil {
 		if ctx.opts != nil && len(ctx.opts.GIDMap) > 0 {
-			return findID(p.Status.Gids[1], ctx.opts.GIDMap, process.LookupGID, "/proc/sys/fs/overflowgid")
+			return findID(hp.Status.Gids[1], ctx.opts.GIDMap, process.LookupGID, "/proc/sys/fs/overflowgid")
 		}
 		return hp.Hgroup, nil
 	}