mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
ACPI / CPPC: Prevent cpc_desc_ptr points to the invalid data
When CPPC fails to request a PCC channel, the CPC data is freed and cpc_desc_ptr points to the invalid data. Avoid this issue by moving the cpc_desc_ptr assignment after the PCC channel request. Signed-off-by: Hoan Tran <hotran@apm.com> Acked-by: Ashwin Chaugule <ashwin.chaugule@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
8343c40d3d
commit
2324d15447
1 changed files with 3 additions and 3 deletions
|
@ -601,9 +601,6 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
|
||||||
/* Store CPU Logical ID */
|
/* Store CPU Logical ID */
|
||||||
cpc_ptr->cpu_id = pr->id;
|
cpc_ptr->cpu_id = pr->id;
|
||||||
|
|
||||||
/* Plug it into this CPUs CPC descriptor. */
|
|
||||||
per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;
|
|
||||||
|
|
||||||
/* Parse PSD data for this CPU */
|
/* Parse PSD data for this CPU */
|
||||||
ret = acpi_get_psd(cpc_ptr, handle);
|
ret = acpi_get_psd(cpc_ptr, handle);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -616,6 +613,9 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Plug PSD data into this CPUs CPC descriptor. */
|
||||||
|
per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;
|
||||||
|
|
||||||
/* Everything looks okay */
|
/* Everything looks okay */
|
||||||
pr_debug("Parsed CPC struct for CPU: %d\n", pr->id);
|
pr_debug("Parsed CPC struct for CPU: %d\n", pr->id);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue