perf fixes
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: d415a7f1c1a8406b22d95b943c66a5b73a37bc19 perf: Fix context leak in put_event()
Two small fixes: a kernel side context leak fix, and a tooling crash fix.
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (1):
perf annotate: Fix fallback to unparsed disassembler line
Leon Yu (1):
perf: Fix context leak in put_event()
kernel/events/core.c | 2 +- tools/perf/util/annotate.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -3591,7 +3591,7 @@ static void put_event(struct perf_event *event) ctx =perf_event_ctx_lock_nested (event,SINGLE_DEPTH_NESTING );WARN_ON_ONCE (ctx->parent_ctx);perf_remove_from_context (event, true); -mutex_unlock (&ctx->mutex); +perf_event_ctx_unlock (event, ctx);_free_event (event); }
tools/perf/util/annotate.c +2 -0
@@ -30,6 +30,8 @@ static int disasm_line__parse(char *line, char **namep, char **rawp);static void ins__delete (struct ins_operands *ops) { +if (ops ==NULL ) +return ;zfree (&ops->source.raw);zfree (&ops->source.name);zfree (&ops->target.raw);