diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:20 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:20 -0500 |
commit | bb952bb98a7e479262c7eb25d5592545a3af147d (patch) | |
tree | 9a2158c07a22a5fbddcec412944d2e7534eecc8f /kernel/fork.c | |
parent | 275bb41e9d058fbb327e7642f077e1beaeac162e (diff) |
CRED: Separate per-task-group keyrings from signal_struct
Separate per-task-group keyrings from signal_struct and dangle their anchor
from the cred struct rather than the signal_struct.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index c932e283ddfc..ded1972672a3 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -802,12 +802,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
802 | if (!sig) | 802 | if (!sig) |
803 | return -ENOMEM; | 803 | return -ENOMEM; |
804 | 804 | ||
805 | ret = copy_thread_group_keys(tsk); | ||
806 | if (ret < 0) { | ||
807 | kmem_cache_free(signal_cachep, sig); | ||
808 | return ret; | ||
809 | } | ||
810 | |||
811 | atomic_set(&sig->count, 1); | 805 | atomic_set(&sig->count, 1); |
812 | atomic_set(&sig->live, 1); | 806 | atomic_set(&sig->live, 1); |
813 | init_waitqueue_head(&sig->wait_chldexit); | 807 | init_waitqueue_head(&sig->wait_chldexit); |
@@ -852,7 +846,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
852 | void __cleanup_signal(struct signal_struct *sig) | 846 | void __cleanup_signal(struct signal_struct *sig) |
853 | { | 847 | { |
854 | thread_group_cputime_free(sig); | 848 | thread_group_cputime_free(sig); |
855 | exit_thread_group_keys(sig); | ||
856 | tty_kref_put(sig->tty); | 849 | tty_kref_put(sig->tty); |
857 | kmem_cache_free(signal_cachep, sig); | 850 | kmem_cache_free(signal_cachep, sig); |
858 | } | 851 | } |