Skip to contentSkip to conversation

acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot()

PATCH In review Igor Mammedov 2 participants 2 messages Mar 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot()

Coverity spots subj in following guest triggered code path
pci_write(, data = 0) -> acpi_pcihp_eject_slot(,slots = 0)

     uinst32_t slot = ctz32(slots)
     ...
     ... = ~(1U << slot)

where 'slot' value is 32 in case 'slots' bitmap is empty. 'slots' is a bitmap and empty one shouldn't do anything so return early doing nothing if resulted slot value is not valid (i.e. not in 0-31 range)

---
 hw/acpi/pcihp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/pcihp.c +1 -1
index 4dcef372bf..0dc963e983 100644
@@ -154,7 +154,7 @@ static void acpi_pcihp_eject_slot(AcpiPciHpState *s, unsigned bsel, unsigned slo
 
     trace_acpi_pci_eject_slot(bsel, slot);
 
-    if (!bus) {
+    if (!bus || slot > 31) {
         return;
     }
 
Signature · 1 line
2.18.1
#1 lore raw
Quoted 5 lines · Igor Mammedov

Coverity spots subj in following guest triggered code path
pci_write(, data = 0) -> acpi_pcihp_eject_slot(,slots = 0)

     uinst32_t slot = ctz32(slots)
     ...
     ... = ~(1U << slot)
Quoted 7 lines

where 'slot' value is 32 in case 'slots' bitmap is empty. 'slots' is a bitmap and empty one shouldn't do anything so return early doing nothing if resulted slot value is not valid (i.e. not in 0-31 range)

tagged, thanks!

Quoted 19 lines
---
 hw/acpi/pcihp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/pcihp.c +1 -1
index 4dcef372bf..0dc963e983 100644
@@ -154,7 +154,7 @@ static void acpi_pcihp_eject_slot(AcpiPciHpState *s, unsigned bsel, unsigned slo
 
     trace_acpi_pci_eject_slot(bsel, slot);
 
-    if (!bus) {
+    if (!bus || slot > 31) {
         return;
     }
 
Signature · 1 line
2.18.1