jail: always call cgroups_free()

[project/procd.git] / jail / jail.c

diff --git a/jail/jail.c b/jail/jail.c
index 7ec6cd8281733868689cc885c08031d6ec8c783e..529ac6b9ff53abe0fde209bd1a2151a34b396d98 100644 (file)
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -249,6 +249,7 @@ static void free_opts(bool parent) {
 
        free_library_search();
        mount_free();
+       cgroups_free();
 
        /* we need to keep argv, envp and seccomp filter in child */
        if (parent) { /* parent-only */
@@ -259,9 +260,6 @@ static void free_opts(bool parent) {
 
                free_oci_envp(opts.jail_argv);
                free_oci_envp(opts.envp);
-       } else { /* child-only */
-               if (opts.ocibundle)
-                       cgroups_free();
        }
 
        free_rlimits();
@@ -2775,6 +2773,8 @@ static void post_main(struct uloop_timeout *t)
                if (opts.setns.time != -1) {
                        timens_fd = ns_open_pid("time", getpid());
                        setns_open(CLONE_NEWTIME);
+               } else {
+                       timens_fd = -1;
                }
 #endif