diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 11:56:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 11:56:24 -0800 |
| commit | 952363c90c93e967c8e1819131b68cbb6f9c962f (patch) | |
| tree | d68303e8615d56cff385ee1331ab536994e8096f | |
| parent | 2d959e95658a0224b0dd0d787926d5ffc95f9574 (diff) | |
| parent | 05cbaa2853cdfc255fdd04e65a82bfe9208c4e52 (diff) | |
| download | kernel_samsung_smdk4412-952363c90c93e967c8e1819131b68cbb6f9c962f.zip kernel_samsung_smdk4412-952363c90c93e967c8e1819131b68cbb6f9c962f.tar.gz kernel_samsung_smdk4412-952363c90c93e967c8e1819131b68cbb6f9c962f.tar.bz2 | |
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix NULL deref in inheritance code
perf: Pass appropriate frame pointer to dump_trace()
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 | ||||
| -rw-r--r-- | kernel/perf_event.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index c223b7e..d616c06 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -2347,7 +2347,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry) callchain_store(entry, PERF_CONTEXT_KERNEL); callchain_store(entry, regs->ip); - dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry); + dump_trace(NULL, regs, NULL, regs->bp, &backtrace_ops, entry); } /* diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 1f38270..603c0d8b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -5148,7 +5148,7 @@ int perf_event_init_task(struct task_struct *child) GFP_KERNEL); if (!child_ctx) { ret = -ENOMEM; - goto exit; + break; } __perf_event_init_context(child_ctx, child); @@ -5164,7 +5164,7 @@ int perf_event_init_task(struct task_struct *child) } } - if (inherited_all) { + if (child_ctx && inherited_all) { /* * Mark the child context as a clone of the parent * context, or of whatever the parent is a clone of. @@ -5184,7 +5184,6 @@ int perf_event_init_task(struct task_struct *child) get_ctx(child_ctx->parent_ctx); } -exit: mutex_unlock(&parent_ctx->mutex); perf_unpin_context(parent_ctx); |