Merge pull request #5870 from dtrudg/issue5869

cclerget · web-flow · commit 47d3b5d41516 · 2021-03-10T15:39:12.000+01:00
e2e: walk until gid!=0 when finding unpriv uid/gid
diff --git a/e2e/internal/e2e/init/init_linux.go b/e2e/internal/e2e/init/init_linux.go
@@ -68,7 +68,7 @@ static int getUnprivIDs(pid_t pid, uid_t *uid, gid_t *gid) {
 		return -1;
 	}
 	pid_t ppid = getProcInfo(pid, uid, gid);
-	if ( *uid == 0 ) {
+	if ( *uid == 0 || *gid == 0 ) {
 		return getUnprivIDs(ppid, uid, gid);
 	}
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static int getUnprivIDs(pid_t pid, uid_t uid, gid_t gid) {`
`68`	`68`	`return -1;`
`69`	`69`	`}`
`70`	`70`	`pid_t ppid = getProcInfo(pid, uid, gid);`
`71`		`- if ( *uid == 0 ) {`
	`71`	`+ if ( uid == 0 \|\| gid == 0 ) {`
`72`	`72`	`return getUnprivIDs(ppid, uid, gid);`
`73`	`73`	`}`
`74`	`74`	`return 0;`