Commit eb8c68ef authored Jan 27, 2014 by Konrad Rzeszutek Wilk Committed by Rafael J. Wysocki Jan 28, 2014

acpi-cpufreq: De-register CPU notifier and free struct msr on error.



If cpufreq_register_driver() fails we would free the acpi driver
related structures but not free the ones allocated
by acpi_cpufreq_boost_init() function. This meant that as
the driver error-ed out and a CPU online/offline event came
we would crash and burn as one of the CPU notifiers would point
to garbage.

Fixes: cfc9c8ed (acpi-cpufreq: Adjust the code to use the common boost attribute)
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 4f11b85a

drivers/cpufreq/acpi-cpufreq.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -919,7 +919,7 @@ static void __init acpi_cpufreq_boost_init(void)
	}		}
	}		}

	static void __exit acpi_cpufreq_boost_exit(void)		static void acpi_cpufreq_boost_exit(void)
	{		{
	if (msrs) {		if (msrs) {
	unregister_cpu_notifier(&boost_nb);		unregister_cpu_notifier(&boost_nb);
	@@ -969,9 +969,10 @@ static int __init acpi_cpufreq_init(void)
	acpi_cpufreq_boost_init();		acpi_cpufreq_boost_init();

	ret = cpufreq_register_driver(&acpi_cpufreq_driver);		ret = cpufreq_register_driver(&acpi_cpufreq_driver);
	if (ret)		if (ret) {
	free_acpi_perf_data();		free_acpi_perf_data();
			acpi_cpufreq_boost_exit();
			}
	return ret;		return ret;
	}		}