diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2016-03-24 11:14:51 +0000 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-24 08:40:21 -0400 |
| commit | 5709e7ba03717ab760b5ad6ebcf4a9e2f633dcc4 (patch) | |
| tree | aa433c9dcc5ed1d9b7050979ff5b27c7c59db8b8 | |
| parent | 143cf26c48278bd438a97a8bd3e18b6460192981 (diff) | |
| download | lwn-5709e7ba03717ab760b5ad6ebcf4a9e2f633dcc4.tar.gz lwn-5709e7ba03717ab760b5ad6ebcf4a9e2f633dcc4.zip | |
perf: Do not double free
[ Upstream commit 130056275ade730e7a79c110212c8815202773ee ]
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@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dvyukov@google.com
Cc: eranian@google.com
Cc: oleg@redhat.com
Cc: panand@redhat.com
Cc: sasha.levin@oracle.com
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/20160224174947.697350349@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: He Kuang <hekuang@huawei.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | kernel/events/core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index e1af58e23bee..992b16aac559 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8221,7 +8221,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: |