aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2010-05-26 17:43:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 12:12:46 -0400
commit4dec2a91fd7e8815d730afbfdcf085cbf53433ac (patch)
treecd33cc793abf532d4ca212d09c1e8d3154a8b530 /kernel/exit.c
parentffdf91856c812646aa276711fa7e3ad80b00764a (diff)
fork/exit: move tty_kref_put() outside of __cleanup_signal()
tty_kref_put() has two callsites in copy_process() paths, 1. if copy_process() suceeds it is called before we copy signal->tty from parent 2. otherwise it is called from __cleanup_signal() under bad_fork_cleanup_signal: label In both cases tty_kref_put() is not right and unneeded because we don't have the balancing tty_kref_get(). Fortunately, this is harmless because this can only happen without CLONE_THREAD, and in this case signal->tty must be NULL. Remove tty_kref_put() from copy_process() and __cleanup_signal(), and change another caller of __cleanup_signal(), __exit_signal(), to call tty_kref_put() by hand. I hope this change makes sense by itself, but it is also needed to make ->signal refcountable. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Alan Cox <alan@linux.intel.com> Acked-by: Roland McGrath <roland@redhat.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 4c70c377d21f..4a72f1753edb 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -149,6 +149,7 @@ static void __exit_signal(struct task_struct *tsk)
149 * see account_group_exec_runtime(). 149 * see account_group_exec_runtime().
150 */ 150 */
151 task_rq_unlock_wait(tsk); 151 task_rq_unlock_wait(tsk);
152 tty_kref_put(sig->tty);
152 __cleanup_signal(sig); 153 __cleanup_signal(sig);
153 } 154 }
154} 155}