61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
|
From 1a122b51bddc216fa129e039012711a1a1a8b6b4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 14 Oct 2024 16:42:03 +0800
|
||
|
|
Subject: [PATCH] hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access
|
||
|
|
failure
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
pnv_phb3_root_bus_info and pnv_phb4_root_bus_info are missing the
|
||
|
|
instance_size initialization. This results in accessing out-of-bound
|
||
|
|
memory when setting 'chip-id' and 'phb-id', and eventually crashes
|
||
|
|
glib's malloc functionality with the following message:
|
||
|
|
|
||
|
|
"qemu-system-ppc64: GLib: ../glib-2.72.3/glib/gmem.c:131: failed to allocate 3232 bytes"
|
||
|
|
|
||
|
|
This issue was noticed only when running qtests with QEMU Windows
|
||
|
|
32-bit executable. Windows 64-bit, Linux 32/64-bit do not expose
|
||
|
|
this bug though.
|
||
|
|
|
||
|
|
Fixes: 9ae1329ee2fe ("ppc/pnv: Add models for POWER8 PHB3 PCIe Host bridge")
|
||
|
|
Fixes: 4f9924c4d4cf ("ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge")
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@kaod.org>
|
||
|
|
Signed-off-by: Xuzhou Cheng <xuzhou.cheng@windriver.com>
|
||
|
|
Signed-off-by: Bin Meng <bin.meng@windriver.com>
|
||
|
|
Message-Id: <20220920103159.1865256-29-bmeng.cn@gmail.com>
|
||
|
|
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
||
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/pci-host/pnv_phb3.c | 1 +
|
||
|
|
hw/pci-host/pnv_phb4.c | 1 +
|
||
|
|
2 files changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
|
||
|
|
index 947efa77dc..bdc128013e 100644
|
||
|
|
--- a/hw/pci-host/pnv_phb3.c
|
||
|
|
+++ b/hw/pci-host/pnv_phb3.c
|
||
|
|
@@ -1130,6 +1130,7 @@ static void pnv_phb3_root_bus_class_init(ObjectClass *klass, void *data)
|
||
|
|
static const TypeInfo pnv_phb3_root_bus_info = {
|
||
|
|
.name = TYPE_PNV_PHB3_ROOT_BUS,
|
||
|
|
.parent = TYPE_PCIE_BUS,
|
||
|
|
+ .instance_size = sizeof(PnvPHB3RootBus),
|
||
|
|
.class_init = pnv_phb3_root_bus_class_init,
|
||
|
|
.interfaces = (InterfaceInfo[]) {
|
||
|
|
{ INTERFACE_PCIE_DEVICE },
|
||
|
|
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
|
||
|
|
index 4e17a48d35..9f115da7ac 100644
|
||
|
|
--- a/hw/pci-host/pnv_phb4.c
|
||
|
|
+++ b/hw/pci-host/pnv_phb4.c
|
||
|
|
@@ -1321,6 +1321,7 @@ static void pnv_phb4_root_bus_class_init(ObjectClass *klass, void *data)
|
||
|
|
static const TypeInfo pnv_phb4_root_bus_info = {
|
||
|
|
.name = TYPE_PNV_PHB4_ROOT_BUS,
|
||
|
|
.parent = TYPE_PCIE_BUS,
|
||
|
|
+ .instance_size = sizeof(PnvPHB4RootBus),
|
||
|
|
.class_init = pnv_phb4_root_bus_class_init,
|
||
|
|
.interfaces = (InterfaceInfo[]) {
|
||
|
|
{ INTERFACE_PCIE_DEVICE },
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|