]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
hw/cxl: Fix out of bound array access
authorDmitry Frolov <frolov@swemel.ru>
Tue, 19 Sep 2023 10:19:25 +0000 (11:19 +0100)
committerMichael Tokarev <mjt@tls.msk.ru>
Thu, 21 Sep 2023 08:31:18 +0000 (11:31 +0300)
According to cxl_interleave_ways_enc(), fw->num_targets is allowed to be up
to 16. This also corresponds to CXL r3.0 spec. So, the fw->target_hbs[]
array is iterated from 0 to 15. But it is statically declared of length 8.
Thus, out of bound array access may occur.

Fixes: c28db9e000 ("hw/pci-bridge: Make PCIe and CXL PXB Devices inherit from TYPE_PXB_DEV")
Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Link: https://lore.kernel.org/r/20230913101055.754709-1-frolov@swemel.ru
Cc: qemu-stable@nongnu.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
include/hw/cxl/cxl.h

index 56c9e7676e22b408b881f6e65716b7a23ce2dd9d..49447258492b94e8a56158a72d2d91ddad96a00c 100644 (file)
@@ -29,7 +29,7 @@ typedef struct PXBCXLDev PXBCXLDev;
 typedef struct CXLFixedWindow {
     uint64_t size;
     char **targets;
-    PXBCXLDev *target_hbs[8];
+    PXBCXLDev *target_hbs[16];
     uint8_t num_targets;
     uint8_t enc_int_ways;
     uint8_t enc_int_gran;