Re: [PATCH v3 5/9] nvram: add nrf51_soc flash read method

2020-07-16 Thread Peter Maydell
On Tue, 30 Jun 2020 at 13:31, P J P  wrote:
>
> From: Prasad J Pandit 
>
> Add nrf51_soc mmio read method to avoid NULL pointer dereference
> issue.
>
> Reported-by: Lei Sun 
> Signed-off-by: Prasad J Pandit 
> ---
>  hw/nvram/nrf51_nvm.c | 5 +
>  1 file changed, 5 insertions(+)
>
> Update v3: use g_assert_not_reached()
>   -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg09560.html
>
> diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
> index f2283c1a8d..82e89d965b 100644
> --- a/hw/nvram/nrf51_nvm.c
> +++ b/hw/nvram/nrf51_nvm.c
> @@ -273,6 +273,10 @@ static const MemoryRegionOps io_ops = {
>  .endianness = DEVICE_LITTLE_ENDIAN,
>  };
>
> +static uint64_t flash_read(void *opaque, hwaddr offset, unsigned size)
> +{

Could use a comment about why this is unreachable, since it's
not totally obvious:
/*
 * 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();
> +}
>

Otherwise
Reviewed-by: Peter Maydell 

thanks
-- PMM



[PATCH v3 5/9] nvram: add nrf51_soc flash read method

2020-06-30 Thread P J P
From: Prasad J Pandit 

Add nrf51_soc mmio read method to avoid NULL pointer dereference
issue.

Reported-by: Lei Sun 
Signed-off-by: Prasad J Pandit 
---
 hw/nvram/nrf51_nvm.c | 5 +
 1 file changed, 5 insertions(+)

Update v3: use g_assert_not_reached()
  -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg09560.html

diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index f2283c1a8d..82e89d965b 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -273,6 +273,10 @@ static const MemoryRegionOps io_ops = {
 .endianness = DEVICE_LITTLE_ENDIAN,
 };
 
+static uint64_t flash_read(void *opaque, hwaddr offset, unsigned size)
+{
+g_assert_not_reached();
+}
 
 static void flash_write(void *opaque, hwaddr offset, uint64_t value,
 unsigned int size)
@@ -300,6 +304,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