hvmloader: Fix reading ACPI PM1 CNT value
PATCH 1/1 hvmloader: Fix reading ACPI PM1 CNT value
In order to get the CNT value from QEMU, we were supposed to read a word, according to the implementation in QEMU. But it has been lax and allowed to read a single byte. This has changed with commit 5d971f9e6725 ("memory: Revert "memory: accept mismatching sizes in memory_region_access_valid"") and result in hvmloader crashing on the BUG_ON.
---
I'll try to have the QEMU implementation changes to allow reading a byte, but it would probably by nice to not have to change qemu.
--- tools/firmware/hvmloader/hvmloader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/firmware/hvmloader/hvmloader.c +3 -3
@@ -256,7 +256,7 @@ static const struct bios_config *detect_bios(void)static void acpi_enable_sci (void ) { -uint8_t pm1a_cnt_val; +uint16_t pm1a_cnt_val;#define PIIX4_SMI_CMD_IOPORT 0xb2#define PIIX4_ACPI_ENABLE 0xf1
@@ -265,11 +265,11 @@ static void acpi_enable_sci(void)* PIIX4 emulation in QEMU has SCI_EN=0 by default. We have no legacy * SMM implementation, so give ACPI control to the OSPM immediately. */ - pm1a_cnt_val =inb (ACPI_PM1A_CNT_BLK_ADDRESS_V1 ); + pm1a_cnt_val =inw (ACPI_PM1A_CNT_BLK_ADDRESS_V1 );if ( !(pm1a_cnt_val &ACPI_PM1C_SCI_EN ) )outb (PIIX4_SMI_CMD_IOPORT ,PIIX4_ACPI_ENABLE ); - pm1a_cnt_val =inb (ACPI_PM1A_CNT_BLK_ADDRESS_V1 ); + pm1a_cnt_val =inw (ACPI_PM1A_CNT_BLK_ADDRESS_V1 );BUG_ON (!(pm1a_cnt_val &ACPI_PM1C_SCI_EN )); }
Signature · 1 line
Anthony PERARD
Quoted 6 lines · Anthony PERARD
In order to get the CNT value from QEMU, we were supposed to read a word, according to the implementation in QEMU. But it has been lax and allowed to read a single byte. This has changed with commit
5d971f9e6725("memory: Revert "memory: accept mismatching sizes inmemory_region_access_valid"") and result in hvmloader crashing on theBUG_ON.
This is a bug on the QEMU side, the ACPI spec states: "Accesses to PM1 control registers are accessed through byte and word accesses.". That's on section 4.8.3.2.1 PM1 Control Registers of my copy of the ACPI spec (6.2A).
Quoted 2 lines
Signed-off-by Anthony PERARD <[email protected]>
I'm fine with this if such bogus behavior has made it's way into a release version of QEMU, but it needs to state it's a workaround for a QEMU bug, not a bug in hvmloader.
IMO the QEMU change should be reverted.
Thanks, Roger.
Quoted 8 lines · Roger Pau Monné
Quoted 6 lines · Anthony PERARD
In order to get the CNT value from QEMU, we were supposed to read a word, according to the implementation in QEMU. But it has been lax and allowed to read a single byte. This has changed with commit
5d971f9e6725("memory: Revert "memory: accept mismatching sizes inmemory_region_access_valid"") and result in hvmloader crashing on theBUG_ON.
Quoted 4 lines
This is a bug on the QEMU side, the ACPI spec states: "Accesses to PM1 control registers are accessed through byte and word accesses.". That's on section 4.8.3.2.1 PM1 Control Registers of my copy of the ACPI spec (6.2A).
I guess we can ignore this patch then, and I should write a patch for QEMU instead.
Quoted 3 lines
I'm fine with this if such bogus behavior has made it's way into a release version of QEMU, but it needs to state it's a workaround for a QEMU bug, not a bug in hvmloader.
It hasn't, but might.
Quoted 1 line
IMO the QEMU change should be reverted.
The change can't be reverted, it is to fix a CVE and isn't related to ACPI. But we can fix the emulator.
Quoted 1 line
Thanks, Roger.
Thanks,
Signature · 1 line
Anthony PERARD