Merge pull request containers#20769 from giuseppe/fix-crash-podman-info

system: enhance check for re-exec into rootless userns
lsm5 · Nov 27, 2023 · 208ad3b · 208ad3b
2 parents ac23b02 + 41a6b99
commit 208ad3b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
@@ -88,7 +88,8 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool)
 	if err != nil {
 		return err
 	}
-	if hasCapSysAdmin {
+	// check for both euid == 0 and CAP_SYS_ADMIN because we may be running in a container with CAP_SYS_ADMIN set.
+	if os.Geteuid() == 0 && hasCapSysAdmin {
 		ownsCgroup, err := cgroups.UserOwnsCurrentSystemdCgroup()
 		if err != nil {
 			logrus.Infof("Failed to detect the owner for the current cgroup: %v", err)