[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 1/2] libacpi: Prevent CPU hotplug AML from corrupting memory
CPU hotplug relies on the online CPU bitmap being provided on PIO 0xaf00 by the device model. The GPE handler checks this and compares it against the "online" flag on each MADT LAPIC entry, setting the flag to its related bit in the bitmap and adjusting the table's checksum. The bytecode doesn't, however, stop at NCPUS. It keeps comparing until it reaches 128, even if that overflows the MADT into some other (hopefully mapped) memory. The reading isn't as problematic as the writing though. If an "entry" outside the MADT is deemed to disagree with the CPU bitmap then the bit where the "online" flag would be is flipped, thus corrupting that memory. And the MADT checksum gets adjusted for a flip that happened outside its range. It's all terrible. Note that this corruption happens regardless of the device-model being present or not, because even if the bitmap holds 0s, the overflowed memory might not at the bits corresponding to the "online" flag. This patch adjusts the DSDT so entries >=NCPUS are skipped. Fixes: c70ad37a1f7c("HVM vcpu add/remove: setup dsdt infrastructure...") Reported-by: Grygorii Strashko <grygorii_strashko@xxxxxxxx> Signed-off-by: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx> --- Half RFC. Not thoroughly untested. Pipeline is green, but none of this is tested there. v2: * New patch with the general fix for HVM too. Turns out the correction logic was buggy after all. --- tools/libacpi/mk_dsdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 8ac4f9d0b4..06a229e2e9 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -239,7 +239,8 @@ int main(int argc, char **argv) /* Extract current CPU's status: 0=offline; 1=online. */ stmt("And", "Local1, 1, Local2"); /* Check if status is up-to-date in the relevant MADT LAPIC entry... */ - push_block("If", "LNotEqual(Local2, \\_SB.PR%02X.FLG)", cpu); + push_block("If", "And(LLess(%d, NCPU), LNotEqual(Local2, \\_SB.PR%02X.FLG))", + cpu, cpu); /* ...If not, update it and the MADT checksum, and notify OSPM. */ stmt("Store", "Local2, \\_SB.PR%02X.FLG", cpu); push_block("If", "LEqual(Local2, 1)"); -- 2.43.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |