Commit 4e0c06e0 authored Apr 30, 2019 by Viresh Kumar Committed by Greg Kroah-Hartman May 31, 2019

sched/cpufreq: Fix kobject memleak



[ Upstream commit 9a4f26cc98d81b67ecc23b890c28e2df324e29f3 ]

Currently the error return path from kobject_init_and_add() is not
followed by a call to kobject_put() - which means we are leaking
the kobject.

Fix it by adding a call to kobject_put() in the error path of
kobject_init_and_add().

Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tobin C. Harding <tobin@kernel.org>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Link: http://lkml.kernel.org/r/20190430001144.24890-1-tobin@kernel.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b5b14bf2

drivers/cpufreq/cpufreq.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1065,6 +1065,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
		cpufreq_global_kobject, "policy%u", cpu);
		if (ret) {
		pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret);
		kobject_put(&policy->kobj);
		goto err_free_real_cpus;
		}

drivers/cpufreq/cpufreq_governor.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,8 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy)
		/* Failure, so roll back. */
		pr_err("initialization failed (dbs_data kobject init error %d)\n", ret);

		kobject_put(&dbs_data->attr_set.kobj);

		policy->governor_data = NULL;

		if (!have_governor_per_policy())