@samitouri / QOSamiQemu / commits / e5f6fafcd9

hw/intc/arm_gicv5: Add missing early return in gicv5_set_handling()

In gicv5_set_handling(), if the guest tried to set the handling mode on a nonexistent SPI then we print a GUEST_ERROR log message. However, we forgot to then return, so execution continues into a NULL pointer dereference. Add the missing "return", bringing the code structure in to line with the equivalent parts in other functions like gicv5_set_pending() and gicv5_set_target(). CID: 1659596 Fixes: 5beb48ab53d ("hw/intc/arm_gicv5: Make gicv5_set_* update SPI state") Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-id: 20260512093856.3197700-5-peter.maydell@linaro.org

Peter Maydell committed May 12, 2026 at 10:38 UTC e5f6fafcd92a71aca27ffcfa3980f96ea5a512c4
1 file changed +1
hw/intc/arm_gicv5.c
+1
@@ -926,6 +926,7 @@ void gicv5_set_handling(GICv5Common *cs, uint32_t id,
926 if (!spi) {
927 qemu_log_mask(LOG_GUEST_ERROR, "gicv5_set_handling: tried to set "
928 "priority of unreachable SPI %d\n", id);
929 + return;
930 }
931
932 spi->hm = handling;