Unverified Commit 31421c83 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12298 CVE-2024-46822 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7XABSPMN7DYKKVVPEGT6HERGBY2K5PXD/ 
From: wangheyuan <wangheyuan2@h-partners.com>

James Morse (1):
  arm64: acpi: Move get_cpu_for_acpi_id() to a header

Jonathan Cameron (1):
  arm64: acpi: Harden get_cpu_for_acpi_id() against missing CPU entry


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAU9OA 
 
Link:https://gitee.com/openeuler/kernel/pulls/12298

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 950c74b8 55b74e68

arch/arm64/include/asm/acpi.h

+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,18 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu) 
	return	acpi_cpu_get_madt_gicc(cpu)->uid;

}



static inline int get_cpu_for_acpi_id(u32 uid)

{

	int cpu;



	for (cpu = 0; cpu < nr_cpu_ids; cpu++)

		if (acpi_cpu_get_madt_gicc(cpu) &&

		    uid == get_acpi_id_for_cpu(cpu))

			return cpu;



	return -EINVAL;

}



static inline void arch_fix_phys_package_id(int num, u32 slot) { }

void __init acpi_init_cpus(void);

int apei_claim_sea(struct pt_regs *regs);

arch/arm64/kernel/acpi_numa.c

+0 −11
Original line number Diff line number Diff line
@@ -34,17 +34,6 @@ int __init acpi_numa_get_nid(unsigned int cpu) 
	return acpi_early_node_map[cpu];

}



static inline int get_cpu_for_acpi_id(u32 uid)

{

	int cpu;



	for (cpu = 0; cpu < nr_cpu_ids; cpu++)

		if (uid == get_acpi_id_for_cpu(cpu))

			return cpu;



	return -EINVAL;

}



static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header,

				      const unsigned long end)

{