From: Frederic Barrat <fbarrat@linux.ibm.com>
Date: Wed, 24 Jul 2024 21:21:27 +0000 (-0500)
Subject: pnv/xive2: Fail VST entry address computation if table has no VSD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fa414eb6655228e274811ade0c7bcddb88acaee5;p=qemu.git

pnv/xive2: Fail VST entry address computation if table has no VSD

Fail VST entry address computation if firmware doesn't define a descriptor
for one of the Virtualization Structure Tables (VST), there's no point in
trying to compute the address of its entry.  Abort the operation and log
an error.

Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Michael Kowal <kowal@linux.vnet.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---

diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c
index 08b9166a09..9fbd44f974 100644
--- a/hw/intc/pnv_xive2.c
+++ b/hw/intc/pnv_xive2.c
@@ -244,6 +244,11 @@ static uint64_t pnv_xive2_vst_addr(PnvXive2 *xive, uint32_t type, uint8_t blk,
     }
 
     vsd = xive->vsds[type][blk];
+    if (vsd == 0) {
+        xive2_error(xive, "VST: vsd == 0 block id %d for VST %s %d !?",
+                   blk, info->name, idx);
+        return 0;
+    }
 
     /* Remote VST access */
     if (GETFIELD(VSD_MODE, vsd) == VSD_MODE_FORWARD) {