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 0def4700108bc961bd4512a2e48ad0b66465c929..34333ead5e21b811bb771099b440118618549d1b 100644 (file)
--- 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;