From: Prasad J Pandit <p...@fedoraproject.org> Add nrf51_soc mmio read method to avoid NULL pointer dereference issue.
Reported-by: Lei Sun <slei.cas...@gmail.com> Signed-off-by: Prasad J Pandit <p...@fedoraproject.org> --- hw/nvram/nrf51_nvm.c | 8 ++++++++ 1 file changed, 8 insertions(+) Update v2: return ldl_le_p() -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg04972.html diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index f2283c1a8d..8000ed530a 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -273,6 +273,13 @@ static const MemoryRegionOps io_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +static uint64_t flash_read(void *opaque, hwaddr offset, unsigned size) +{ + NRF51NVMState *s = NRF51_NVM(opaque); + + assert(offset + size <= s->flash_size); + return ldl_le_p(s->storage + offset); +} static void flash_write(void *opaque, hwaddr offset, uint64_t value, unsigned int size) @@ -300,6 +307,7 @@ static void flash_write(void *opaque, hwaddr offset, uint64_t value, static const MemoryRegionOps flash_ops = { + .read = flash_read, .write = flash_write, .valid.min_access_size = 4, .valid.max_access_size = 4, -- 2.26.2
