1 files changed, 18 insertions, 15 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index fb8572a42297..72e3252c6763 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -743,6 +743,14 @@ int unshare_files(void)
 
 EXPORT_SYMBOL(unshare_files);
 
+void sighand_free_cb(struct rcu_head *rhp)
+{
+        struct sighand_struct *sp;
+
+        sp = container_of(rhp, struct sighand_struct, rcu);
+        kmem_cache_free(sighand_cachep, sp);
+}
+
 static inline int copy_sighand(unsigned long clone_flags, struct task_struct * tsk)
 {
         struct sighand_struct *sig;
@@ -752,7 +760,7 @@ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * t
                 return 0;
         }
         sig = kmem_cache_alloc(sighand_cachep, GFP_KERNEL);
-        tsk->sighand = sig;
+        rcu_assign_pointer(tsk->sighand, sig);
         if (!sig)
                 return -ENOMEM;
         spin_lock_init(&sig->siglock);
@@ -803,9 +811,6 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts
         sig->it_prof_expires = cputime_zero;
         sig->it_prof_incr = cputime_zero;
 
-        sig->tty = current->signal->tty;
-        sig->pgrp = process_group(current);
-        sig->session = current->signal->session;
         sig->leader = 0;        /* session leadership doesn't inherit */
         sig->tty_old_pgrp = 0;
 
@@ -964,12 +969,13 @@ static task_t *copy_process(unsigned long clone_flags,
         p->io_context = NULL;
         p->io_wait = NULL;
         p->audit_context = NULL;
+        cpuset_fork(p);
 #ifdef CONFIG_NUMA
         p->mempolicy = mpol_copy(p->mempolicy);
         if (IS_ERR(p->mempolicy)) {
                 retval = PTR_ERR(p->mempolicy);
                 p->mempolicy = NULL;
-                goto bad_fork_cleanup;
+                goto bad_fork_cleanup_cpuset;
         }
 #endif
 
@@ -1127,25 +1133,19 @@ static task_t *copy_process(unsigned long clone_flags,
         attach_pid(p, PIDTYPE_PID, p->pid);
         attach_pid(p, PIDTYPE_TGID, p->tgid);
         if (thread_group_leader(p)) {
+                p->signal->tty = current->signal->tty;
+                p->signal->pgrp = process_group(current);
+                p->signal->session = current->signal->session;
                 attach_pid(p, PIDTYPE_PGID, process_group(p));
                 attach_pid(p, PIDTYPE_SID, p->signal->session);
                 if (p->pid)
                         __get_cpu_var(process_counts)++;
         }
 
-        if (!current->signal->tty && p->signal->tty)
-                p->signal->tty = NULL;
-
         nr_threads++;
         total_forks++;
         write_unlock_irq(&tasklist_lock);
         proc_fork_connector(p);
-        cpuset_fork(p);
-        retval = 0;
-
-fork_out:
-        if (retval)
-                return ERR_PTR(retval);
         return p;
 
 bad_fork_cleanup_namespace:
@@ -1172,7 +1172,9 @@ bad_fork_cleanup_security:
 bad_fork_cleanup_policy:
 #ifdef CONFIG_NUMA
         mpol_free(p->mempolicy);
+bad_fork_cleanup_cpuset:
 #endif
+        cpuset_exit(p);
 bad_fork_cleanup:
         if (p->binfmt)
                 module_put(p->binfmt->module);
@@ -1184,7 +1186,8 @@ bad_fork_cleanup_count:
         free_uid(p->user);
 bad_fork_free:
         free_task(p);
-        goto fork_out;
+fork_out:
+        return ERR_PTR(retval);
 }
 
 struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs)