improve LXC_CMD_GET_CGROUP compatibility

When a newer lxc library communicates with an older one (such as running an lxc 4.0 lxc-freeze on a longer running container which was started while lxc was still at version 3), the LXC_CMD_GET_LIMITING_CGROUP command is not available, causing the remote to just close the socket. Catch this and try the previous command instead. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

improve LXC_CMD_GET_CGROUP compatibility
8bbfacd2 · Wolfgang Bumiller · Christian Brauner · 3537c316 · 8bbfacd2
Unverified Commit 8bbfacd2 authored May 15, 2020 by Wolfgang Bumiller Committed by Christian Brauner May 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

commands.c src/lxc/commands.c +14 -1

No files found.
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -509,8 +509,21 @@ static char *lxc_cmd_get_cgroup_path_do(const char *name, const char *lxcpath,
 	if (ret < 0)
 		return NULL;

-	if (ret == 0)
+	if (ret == 0) {
+		if (command == LXC_CMD_GET_LIMITING_CGROUP) {
+			/*
+			 * This may indicate that the container was started
+			 * under an ealier version before
+			 * `cgroup_advanced_isolation` as implemented, there
+			 * it sees an unknown command and just closes the
+			 * socket, sending us an EOF.
+			 */
+			return lxc_cmd_get_cgroup_path_do(name, lxcpath,
+							  subsystem,
+							  LXC_CMD_GET_CGROUP);
+		}
 		return NULL;
+	}

 	if (cmd.rsp.ret < 0 || cmd.rsp.datalen < 0)
 		return NULL;