From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 7 Dec 2019 17:04:17 +0000 (+0100)
Subject: cgroups/cgfsng: rework cgfsng_payload_destroy()
X-Git-Tag: lxc-4.0.0~78^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc1c3af911da0bf5ce88bb7f7ca1c167ecaeba3b;p=thirdparty%2Flxc.git

cgroups/cgfsng: rework cgfsng_payload_destroy()

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index d98170811..8a6d6cba5 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1086,9 +1086,18 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
 	int ret;
 	struct generic_userns_exec_data wrap;
 
+	if (!ops)
+		log_error_errno(return, ENOENT, "Called with uninitialized cgroup operations");
+
 	if (!ops->hierarchies)
 		return;
 
+	if (!handler)
+		log_error_errno(return, EINVAL, "Called with uninitialized handler");
+
+	if (!handler->conf)
+		log_error_errno(return, EINVAL, "Called with uninitialized conf");
+
 	wrap.origuid = 0;
 	wrap.container_cgroup = ops->container_cgroup;
 	wrap.hierarchies = ops->hierarchies;