Commit 935dff30 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: CPPC: Add NULL pointer check to cppc_get_perf() 



Check cpc_desc against NULL in cppc_get_perf(), so it doesn't crash
down the road if cpc_desc is NULL.

Fixes: 0654cf05 ("ACPI: CPPC: Introduce cppc_get_nominal_perf()")
Reported-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 5.15+ <stable@vger.kernel.org> # 5.15+
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
parent 13605725

drivers/acpi/cppc_acpi.c

+8 −1
Original line number Diff line number Diff line
@@ -998,7 +998,14 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)

{

	struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);

	struct cpc_register_resource *reg = &cpc_desc->cpc_regs[reg_idx];

	struct cpc_register_resource *reg;



	if (!cpc_desc) {

		pr_debug("No CPC descriptor for CPU:%d\n", cpunum);

		return -ENODEV;

	}



	reg = &cpc_desc->cpc_regs[reg_idx];



	if (CPC_IN_PCC(reg)) {

		int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);