SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spapr_pci: add spapr msi read method

Browse Source 
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>
This commit is contained in:
Prasad J Pandit 2020-08-11 17:11:30 +05:30 committed by Paolo Bonzini
parent b5bf601f36
commit 921604e175
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/ppc/spapr_pci.c
View File

@ -53,6 +53,7 @@
#include "sysemu/hostmem.h" #include "sysemu/hostmem.h"
#include "sysemu/numa.h" #include "sysemu/numa.h"
#include "hw/ppc/spapr_numa.h" #include "hw/ppc/spapr_numa.h"
#include "qemu/log.h"
/* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */ /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */
#define RTAS_QUERY_FN 0 #define RTAS_QUERY_FN 0
@ -739,6 +740,12 @@ static PCIINTxRoute spapr_route_intx_pin_to_irq(void *opaque, int pin)
return route; 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. * MSI/MSIX memory region implementation.
* The handler handles both MSI and MSIX. * 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 = { 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, .write = spapr_msi_write,
.endianness = DEVICE_LITTLE_ENDIAN .endianness = DEVICE_LITTLE_ENDIAN
}; };