Merge tag 'acpi-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (adca4ce3) · Commits · 戴 / test

Pull ACPI fixes from Rafael Wysocki: "Fix possible use-after-free in the ACPI CPPC support code (John Garry) and prevent the ACPI HMAT parsing code from using possibly incorrect data coming from the platform firmware (Daniel Black)" * tag 'acpi-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() ACPI: HMAT: ACPI_HMAT_MEMORY_PD_VALID is deprecated since ACPI-6.3

drivers/acpi/cppc_acpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -905,8 +905,8 @@ void acpi_cppc_processor_exit(struct acpi_processor *pr)
		pcc_data[pcc_ss_id]->refcount--;
		if (!pcc_data[pcc_ss_id]->refcount) {
		pcc_mbox_free_channel(pcc_data[pcc_ss_id]->pcc_channel);
		pcc_data[pcc_ss_id]->pcc_channel_acquired = 0;
		kfree(pcc_data[pcc_ss_id]);
		pcc_data[pcc_ss_id] = NULL;
		}
		}
		}

drivers/acpi/hmat/hmat.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
		pr_info("HMAT: Memory Flags:%04x Processor Domain:%d Memory Domain:%d\n",
		p->flags, p->processor_PD, p->memory_PD);

		if (p->flags & ACPI_HMAT_MEMORY_PD_VALID) {
		if (p->flags & ACPI_HMAT_MEMORY_PD_VALID && hmat_revision == 1) {
		target = find_mem_target(p->memory_PD);
		if (!target) {
		pr_debug("HMAT: Memory Domain missing from SRAT\n");

Admin message