diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-10-02 16:17:02 -0700 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-11-05 20:27:46 +0000 |
commit | 96cb09b889f547e49e443966aff537adf6630707 (patch) | |
tree | 6fbd93db477785d4c6e41cebfa85ed7872f0d352 /kernel/events | |
parent | b47191f7d729d2fabd29fbbf3d57158133d4e0ef (diff) | |
download | kernel_samsung_smdk4412-96cb09b889f547e49e443966aff537adf6630707.zip kernel_samsung_smdk4412-96cb09b889f547e49e443966aff537adf6630707.tar.gz kernel_samsung_smdk4412-96cb09b889f547e49e443966aff537adf6630707.tar.bz2 |
perf: fix perf bug in fork()
commit 6c72e3501d0d62fc064d3680e5234f3463ec5a86 upstream.
Oleg noticed that a cleanup by Sylvain actually uncovered a bug; by
calling perf_event_free_task() when failing sched_fork() we will not yet
have done the memset() on ->perf_event_ctxp[] and will therefore try and
'free' the inherited contexts, which are still in use by the parent
process. This is bad..
Suggested-by: Oleg Nesterov <oleg@redhat.com>
Reported-by: Oleg Nesterov <oleg@redhat.com>
Reported-by: Sylvain 'ythier' Hitier <sylvain.hitier@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel/events')
-rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index a11d537..4a14895 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7081,8 +7081,10 @@ int perf_event_init_task(struct task_struct *child) for_each_task_context_nr(ctxn) { ret = perf_event_init_context(child, ctxn); - if (ret) + if (ret) { + perf_event_free_task(child); return ret; + } } return 0; |