Skip to content

Commit

Permalink
spapr_pci: add spapr msi read method
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Prasad J Pandit authored and bonzini committed Feb 8, 2021
1 parent b5bf601 commit 921604e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions hw/ppc/spapr_pci.c
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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
};
Expand Down

0 comments on commit 921604e

Please sign in to comment.