[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 5/9] nvram: add nrf51_soc flash read method
From: |
P J P |
Subject: |
[PATCH v4 5/9] nvram: add nrf51_soc flash read method |
Date: |
Tue, 11 Aug 2020 17:11:29 +0530 |
From: Prasad J Pandit <pjp@fedoraproject.org>
Add nrf51_soc mmio read method to avoid NULL pointer dereference
issue.
Reported-by: Lei Sun <slei.casper@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/nvram/nrf51_nvm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Update v4: add explanatory comment and Reviewed-by tag
-> https://lists.nongnu.org/archive/html/qemu-devel/2020-07/msg05309.html
diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index f2283c1a8d..7b3460d52d 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -273,6 +273,15 @@ static const MemoryRegionOps io_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
+static uint64_t flash_read(void *opaque, hwaddr offset, unsigned size)
+{
+ /*
+ * This is a rom_device MemoryRegion which is always in
+ * romd_mode (we never put it in MMIO mode), so reads always
+ * go directly to RAM and never come here.
+ */
+ g_assert_not_reached();
+}
static void flash_write(void *opaque, hwaddr offset, uint64_t value,
unsigned int size)
@@ -300,6 +309,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
- [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks, P J P, 2020/08/11
- [PATCH v4 1/9] hw/pci-host: add pci-intack write method, P J P, 2020/08/11
- [PATCH v4 2/9] pci-host: designware: add pcie-msi read method, P J P, 2020/08/11
- [PATCH v4 3/9] vfio: add quirk device write method, P J P, 2020/08/11
- [PATCH v4 4/9] prep: add ppc-parity write method, P J P, 2020/08/11
- [PATCH v4 5/9] nvram: add nrf51_soc flash read method,
P J P <=
- [PATCH v4 6/9] spapr_pci: add spapr msi read method, P J P, 2020/08/11
- [PATCH v4 7/9] tz-ppc: add dummy read/write methods, P J P, 2020/08/11
- [PATCH v4 8/9] imx7-ccm: add digprog mmio write method, P J P, 2020/08/11
- [PATCH v4 9/9] memory: assert MemoryRegionOps callbacks are defined, P J P, 2020/08/11
- Re: [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks, David Gibson, 2020/08/13