[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/46] spapr_pci: add spapr msi read method
From: |
Paolo Bonzini |
Subject: |
[PULL 42/46] spapr_pci: add spapr msi read method |
Date: |
Mon, 8 Feb 2021 19:23:27 +0100 |
From: Prasad J Pandit <pjp@fedoraproject.org>
Add spapr msi mmio read method to avoid NULL pointer dereference
issue.
Reported-by: Lei Sun <slei.casper@gmail.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-Id: <20200811114133.672647-7-ppandit@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/ppc/spapr_pci.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 76d7c91e9c..b89f810034 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -53,6 +53,7 @@
#include "sysemu/hostmem.h"
#include "sysemu/numa.h"
#include "hw/ppc/spapr_numa.h"
+#include "qemu/log.h"
/* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */
#define RTAS_QUERY_FN 0
@@ -739,6 +740,12 @@ static PCIINTxRoute spapr_route_intx_pin_to_irq(void
*opaque, int pin)
return route;
}
+static uint64_t spapr_msi_read(void *opaque, hwaddr addr, unsigned size)
+{
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid access\n", __func__);
+ return 0;
+}
+
/*
* MSI/MSIX memory region implementation.
* The handler handles both MSI and MSIX.
@@ -756,8 +763,11 @@ static void spapr_msi_write(void *opaque, hwaddr addr,
}
static const MemoryRegionOps spapr_msi_ops = {
- /* There is no .read as the read result is undefined by PCI spec */
- .read = NULL,
+ /*
+ * .read result is undefined by PCI spec.
+ * define .read method to avoid assert failure in memory_region_init_io
+ */
+ .read = spapr_msi_read,
.write = spapr_msi_write,
.endianness = DEVICE_LITTLE_ENDIAN
};
--
2.29.2
- [PULL 22/46] tests/meson: Only build softfloat objects if TCG is selected, (continued)
- [PULL 22/46] tests/meson: Only build softfloat objects if TCG is selected, Paolo Bonzini, 2021/02/08
- [PULL 23/46] pc-bios/meson: Only install EDK2 blob firmwares with system emulation, Paolo Bonzini, 2021/02/08
- [PULL 24/46] meson: Restrict block subsystem processing, Paolo Bonzini, 2021/02/08
- [PULL 29/46] qapi/meson: Remove QMP from user-mode emulation, Paolo Bonzini, 2021/02/08
- [PULL 27/46] meson: Restrict emulation code, Paolo Bonzini, 2021/02/08
- [PULL 28/46] qapi/meson: Restrict qdev code to system-mode emulation, Paolo Bonzini, 2021/02/08
- [PULL 35/46] replay: rng-builtin support, Paolo Bonzini, 2021/02/08
- [PULL 25/46] meson: Merge trace_events_subdirs array, Paolo Bonzini, 2021/02/08
- [PULL 37/46] hw/pci-host: add pci-intack write method, Paolo Bonzini, 2021/02/08
- [PULL 43/46] tz-ppc: add dummy read/write methods, Paolo Bonzini, 2021/02/08
- [PULL 42/46] spapr_pci: add spapr msi read method,
Paolo Bonzini <=
- [PULL 31/46] qapi/meson: Restrict UI module to system emulation and tools, Paolo Bonzini, 2021/02/08
- [PULL 26/46] meson: Restrict some trace event directories to user/system emulation, Paolo Bonzini, 2021/02/08
- [PULL 30/46] qapi/meson: Restrict system-mode specific modules, Paolo Bonzini, 2021/02/08
- [PULL 32/46] accel/kvm/kvm-all: Fix wrong return code handling in dirty log code, Paolo Bonzini, 2021/02/08
- [PULL 33/46] replay: fix replay of the interrupts, Paolo Bonzini, 2021/02/08
- [PULL 36/46] cpu-throttle: Remove timer_mod() from cpu_throttle_set(), Paolo Bonzini, 2021/02/08
- [PULL 34/46] pc-bios/descriptors: fix paths in json files, Paolo Bonzini, 2021/02/08
- [PULL 38/46] pci-host: designware: add pcie-msi read method, Paolo Bonzini, 2021/02/08
- [PULL 39/46] vfio: add quirk device write method, Paolo Bonzini, 2021/02/08
- [PULL 41/46] nvram: add nrf51_soc flash read method, Paolo Bonzini, 2021/02/08