[NETFILTER]: nf_conntrack_ftp: fix missing helper mask initilization

[linux-2.6] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 1d0e9ea1fa0592b0b1bdf3104e71cc239ffbb256..06de6c4e8ca3a66937ce8763d33ca42852fbb698 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -128,6 +128,7 @@ static void __exit_signal(struct task_struct *tsk)
        flush_sigqueue(&tsk->pending);
        if (sig) {
                flush_sigqueue(&sig->shared_pending);
+               taskstats_tgid_free(sig);
                __cleanup_signal(sig);
        }
 }
@@ -399,11 +400,8 @@ void daemonize(const char *name, ...)
        current->fs = fs;
        atomic_inc(&fs->count);
 
-       exit_namespace(current);
        exit_task_namespaces(current);
-       current->namespace = init_task.namespace;
        current->nsproxy = init_task.nsproxy;
-       get_namespace(current->namespace);
        get_task_namespaces(current);
 
        exit_files(current);
@@ -923,8 +921,6 @@ fastcall NORET_TYPE void do_exit(long code)
        exit_sem(tsk);
        __exit_files(tsk);
        __exit_fs(tsk);
-       exit_namespace(tsk);
-       exit_task_namespaces(tsk);
        exit_thread();
        cpuset_exit(tsk);
        exit_keys(tsk);
@@ -939,6 +935,7 @@ fastcall NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        proc_exit_connector(tsk);
        exit_notify(tsk);
+       exit_task_namespaces(tsk);
 #ifdef CONFIG_NUMA
        mpol_free(tsk->mempolicy);
        tsk->mempolicy = NULL;