x86: Fix leak in uncore_type_init failure paths
Subsystems (2)
The error path of uncore_type_init() frees up any allocations that were made along the way, but it relies upon type->pmus being set, which only happens if the function succeeds. As type->pmus remains null in this case, the call to uncore_type_exit will do nothing.
Moving the assignment earlier will allow us to actually free those allocations should something go awry.
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2 -1
@@ -3334,6 +3334,8 @@ static int __init uncore_type_init(struct intel_uncore_type *type)if (!pmus)return -ENOMEM ; + type->pmus = pmus; + type->unconstrainted = (struct event_constraint )__EVENT_CONSTRAINT (0 , (1ULL << type->num_counters) -1 ,0 , type->num_counters,0 ,0 );
@@ -3369,7 +3371,6 @@ static int __init uncore_type_init(struct intel_uncore_type *type) } type->pmu_group = &uncore_pmu_attr_group; - type->pmus = pmus;return 0 ; fail:uncore_type_exit (type);
tip-bot for Dave Jones
merge bot[tip:perf/urgent] perf/x86: Fix leak in uncore_type_init failure paths
perf/x86: Fix leak in uncore_type_init failure paths
Commit-ID: b7b4839d93e50adccef29eccb694807cdcb8bee3 Gitweb: http://git.kernel.org/tip/b7b4839d93e50adccef29eccb694807cdcb8bee3 Author: Dave Jones <[email protected]> AuthorDate: Thu, 6 Mar 2014 12:20:28 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Mar 2014 11:59:34 +0100
perf/x86: Fix leak in uncore_type_init failure paths
The error path of uncore_type_init() frees up any allocations that were made along the way, but it relies upon type->pmus being set, which only happens if the function succeeds. As type->pmus remains null in this case, the call to uncore_type_exit will do nothing.
Moving the assignment earlier will allow us to actually free those allocations should something go awry.
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2 -1
@@ -3334,6 +3334,8 @@ static int __init uncore_type_init(struct intel_uncore_type *type)if (!pmus)return -ENOMEM ; + type->pmus = pmus; + type->unconstrainted = (struct event_constraint )__EVENT_CONSTRAINT (0 , (1ULL << type->num_counters) -1 ,0 , type->num_counters,0 ,0 );
@@ -3369,7 +3371,6 @@ static int __init uncore_type_init(struct intel_uncore_type *type) } type->pmu_group = &uncore_pmu_attr_group; - type->pmus = pmus;return 0 ; fail:uncore_type_exit (type);