memory: Forbid memory_region_set_address() on AS root

[PATCH] memory: Forbid memory_region_set_address() on AS root

Philippe Mathieu-Daudé posted 1 patch 4 years, 7 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210417125353.632589-1-f4bug@amsat.org

softmmu/memory.c | 1 +
1 file changed, 1 insertion(+)

Expand all Fold all

[PATCH] memory: Forbid memory_region_set_address() on AS root

Posted by Philippe Mathieu-Daudé 4 years, 7 months ago

To be sure an AddressSpace is zero-based, forbid changing
base address of MemoryRegion used as AddressSpace container.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Based-on: <20210417103028.601124-1-f4bug@amsat.org>
---
 softmmu/memory.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/softmmu/memory.c b/softmmu/memory.c
index 409bcaec7f5..73c0e6f84f5 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -2522,6 +2522,7 @@ static void memory_region_readd_subregion(MemoryRegion *mr)
 
 void memory_region_set_address(MemoryRegion *mr, hwaddr addr)
 {
+    assert(!mr->is_root_mr);
     if (addr != mr->addr) {
         mr->addr = addr;
         memory_region_readd_subregion(mr);
-- 
2.26.3

Re: [PATCH] memory: Forbid memory_region_set_address() on AS root

Posted by Philippe Mathieu-Daudé 4 years, 7 months ago

On 4/17/21 2:53 PM, Philippe Mathieu-Daudé wrote:
> To be sure an AddressSpace is zero-based, forbid changing
> base address of MemoryRegion used as AddressSpace container.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Based-on: <20210417103028.601124-1-f4bug@amsat.org>
> ---
>  softmmu/memory.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/softmmu/memory.c b/softmmu/memory.c
> index 409bcaec7f5..73c0e6f84f5 100644
> --- a/softmmu/memory.c
> +++ b/softmmu/memory.c
> @@ -2522,6 +2522,7 @@ static void memory_region_readd_subregion(MemoryRegion *mr)
>  
>  void memory_region_set_address(MemoryRegion *mr, hwaddr addr)
>  {
> +    assert(!mr->is_root_mr);

Hmm to not discriminate the API usage, maybe safer as:

       assert(!(addr && mr->is_root_mr));

>      if (addr != mr->addr) {
>          mr->addr = addr;
>          memory_region_readd_subregion(mr);
>