1 files changed, 15 insertions, 3 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 3fc3c1383912..490495a39c7e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -107,6 +107,7 @@ static struct kmem_cache *mm_cachep;
 
 void free_task(struct task_struct *tsk)
 {
+        prop_local_destroy_single(&tsk->dirties);
         free_thread_info(tsk->stack);
         rt_mutex_debug_task_free(tsk);
         free_task_struct(tsk);
@@ -163,6 +164,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
 {
         struct task_struct *tsk;
         struct thread_info *ti;
+        int err;
 
         prepare_to_copy(orig);
 
@@ -178,6 +180,14 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
 
         *tsk = *orig;
         tsk->stack = ti;
+
+        err = prop_local_init_single(&tsk->dirties);
+        if (err) {
+                free_thread_info(ti);
+                free_task_struct(tsk);
+                return NULL;
+        }
+
         setup_thread_stack(tsk, orig);
 
 #ifdef CONFIG_CC_STACKPROTECTOR
@@ -1069,7 +1079,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         do_posix_clock_monotonic_gettime(&p->start_time);
         p->real_start_time = p->start_time;
         monotonic_to_bootbased(&p->real_start_time);
+#ifdef CONFIG_SECURITY
         p->security = NULL;
+#endif
         p->io_context = NULL;
         p->io_wait = NULL;
         p->audit_context = NULL;
@@ -1146,13 +1158,14 @@ static struct task_struct *copy_process(unsigned long clone_flags,
          * Clear TID on mm_release()?
          */
         p->clear_child_tid = (clone_flags & CLONE_CHILD_CLEARTID) ? child_tidptr: NULL;
+#ifdef CONFIG_FUTEX
         p->robust_list = NULL;
 #ifdef CONFIG_COMPAT
         p->compat_robust_list = NULL;
 #endif
         INIT_LIST_HEAD(&p->pi_state_list);
         p->pi_state_cache = NULL;
-
+#endif
         /*
          * sigaltstack should be cleared when sharing the same VM
          */
@@ -1435,8 +1448,7 @@ long do_fork(unsigned long clone_flags,
 #define ARCH_MIN_MMSTRUCT_ALIGN 0
 #endif
 
-static void sighand_ctor(void *data, struct kmem_cache *cachep,
-                        unsigned long flags)
+static void sighand_ctor(struct kmem_cache *cachep, void *data)
 {
         struct sighand_struct *sighand = data;