Commit-ID: 130056275ade730e7a79c110212c8815202773ee Gitweb: http://git.kernel.org/tip/130056275ade730e7a79c110212c8815202773ee Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Wed, 24 Feb 2016 18:45:41 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Thu, 25 Feb 2016 08:42:32 +0100 perf: Do not double free In case of: err_file: fput(event_file), we'll end up calling perf_release() which in turn will free the event. Do not then free the event _again_. Tested-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: dvyukov@xxxxxxxxxx Cc: eranian@xxxxxxxxxx Cc: oleg@xxxxxxxxxx Cc: panand@xxxxxxxxxx Cc: sasha.levin@xxxxxxxxxx Cc: vince@xxxxxxxxxx Link: http://lkml.kernel.org/r/20160224174947.697350349@xxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/events/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index d7b0316..211a5ce 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8520,7 +8520,12 @@ err_context: perf_unpin_context(ctx); put_ctx(ctx); err_alloc: - free_event(event); + /* + * If event_file is set, the fput() above will have called ->release() + * and that will take care of freeing the event. + */ + if (!event_file) + free_event(event); err_cpus: put_online_cpus(); err_task: -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|