Merge pull request #3352 from Blub/readd-cgroup-ops-check

Revert "start: remove unnecessary check for valid cgroup_ops"

Merge pull request #3352 from Blub/readd-cgroup-ops-check
514b0270 · Christian Brauner · GitHub · 2235ad66 · e2aed383 · 514b0270
Unverified Commit 514b0270 authored Apr 03, 2020 by Christian Brauner Committed by GitHub Apr 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

start.c src/lxc/start.c +4 -2

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -933,8 +933,10 @@ void lxc_end(struct lxc_handler *handler)

 	lsm_process_cleanup(handler->conf, handler->lxcpath);

-	cgroup_ops->payload_destroy(cgroup_ops, handler);
-	cgroup_ops->monitor_destroy(cgroup_ops, handler);
+	if (cgroup_ops) {
+		cgroup_ops->payload_destroy(cgroup_ops, handler);
+		cgroup_ops->monitor_destroy(cgroup_ops, handler);
+	}

 	if (handler->conf->reboot == REBOOT_NONE) {
 		/* For all new state clients simply close the command socket.