From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 10 Feb 2021 19:15:48 +0000 (+0100)
Subject: cgroups: do not return early when entering monitor cgroups
X-Git-Tag: lxc-5.0.0~293^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ee87192ef31ec073521eaafe50b4d356f27e94;p=thirdparty%2Flxc.git

cgroups: do not return early when entering monitor cgroups

This will happen when restoring a container via criu.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 3e92692b5..eb58deaee 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1484,7 +1484,7 @@ __cgfsng_ops static bool cgfsng_monitor_enter(struct cgroup_ops *ops,
 			return log_error_errno(false, errno, "Failed to enter cgroup \"%s\"", h->monitor_full_path);
 
 		if (handler->transient_pid <= 0)
-			return true;
+			continue;
 
 		ret = lxc_writeat(h->cgfd_mon, "cgroup.procs", transient, transient_len);
 		if (ret)