[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-8bc9162cd2bf37036c486b384ac445b59b334b04@git.kernel.org>
Date: Wed, 17 Feb 2016 04:11:56 -0800
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, eranian@...gle.com, mingo@...nel.org,
torvalds@...ux-foundation.org, acme@...hat.com,
vincent.weaver@...ne.edu, linux-kernel@...r.kernel.org,
jolsa@...hat.com, tglx@...utronix.de, hpa@...or.com
Subject: [tip:perf/core] perf/x86/amd/uncore: Plug reference leak
Commit-ID: 8bc9162cd2bf37036c486b384ac445b59b334b04
Gitweb: http://git.kernel.org/tip/8bc9162cd2bf37036c486b384ac445b59b334b04
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Tue, 16 Feb 2016 23:04:41 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 17 Feb 2016 08:36:09 +0100
perf/x86/amd/uncore: Plug reference leak
In the error path of amd_uncore_cpu_up_prepare() the newly allocated uncore
struct is freed, but the percpu pointer still references it. Set it to NULL.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1602162302170.19512@nanos
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index 4974274..8836fc9 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -323,6 +323,8 @@ static int amd_uncore_cpu_up_prepare(unsigned int cpu)
return 0;
fail:
+ if (amd_uncore_nb)
+ *per_cpu_ptr(amd_uncore_nb, cpu) = NULL;
kfree(uncore_nb);
return -ENOMEM;
}
Powered by blists - more mailing lists