Commit 195cb7ac authored by Rafael Mendonca's avatar Rafael Mendonca Committed by Zhang Zekun
Browse files

ACPI: PCC: Release resources on address space setup failure path 

mainline inclusion
from mainline-v6.1-rc1
commit f890157e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VPZ8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f890157e61b85ce8ae01a41ffa375e3b99853698



---------------------------------------------

The allocated memory for the pcc_data struct doesn't get freed under an
error path in pcc_mbox_request_channel() or acpi_os_ioremap(). Also, the
PCC mailbox channel doesn't get freed under an error path in
acpi_os_ioremap().

Fixes: 77e2a047 ("ACPI: PCC: Implement OperationRegion handler for the PCC Type 3 subtype")
Signed-off-by: default avatarRafael Mendonca <rafaelmendsr@gmail.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
parent 09e73dbf

drivers/acpi/acpi_pcc.c

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, 
	if (IS_ERR(data->pcc_chan)) {

		pr_err("Failed to find PCC channel for subspace %d\n",

		       ctx->subspace_id);

		kfree(data);

		return AE_NOT_FOUND;

	}
@@ -72,6 +73,8 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, 
	if (!data->pcc_comm_addr) {

		pr_err("Failed to ioremap PCC comm region mem for %d\n",

		       ctx->subspace_id);

		pcc_mbox_free_channel(data->pcc_chan);

		kfree(data);

		return AE_NO_MEMORY;

	}