summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2023-08-25 14:06:58 -0700
committerRichard Henderson <richard.henderson@linaro.org>2023-08-29 09:55:06 -0700
commit86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc (patch)
treee416472cd11444d8c470c4ce3d61341ec389ed0e
parent813bac3d8d70d85cb7835f7945eb9eed84c2d8d0 (diff)
downloadfocaccia-qemu-86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc.tar.gz
focaccia-qemu-86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc.zip
softmmu: Assert data in bounds in iotlb_to_section
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to '')
-rw-r--r--softmmu/physmem.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 3df73542e1..7597dc1c39 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -2413,9 +2413,15 @@ MemoryRegionSection *iotlb_to_section(CPUState *cpu,
     int asidx = cpu_asidx_from_attrs(cpu, attrs);
     CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx];
     AddressSpaceDispatch *d = qatomic_rcu_read(&cpuas->memory_dispatch);
-    MemoryRegionSection *sections = d->map.sections;
+    int section_index = index & ~TARGET_PAGE_MASK;
+    MemoryRegionSection *ret;
+
+    assert(section_index < d->map.sections_nb);
+    ret = d->map.sections + section_index;
+    assert(ret->mr);
+    assert(ret->mr->ops);
 
-    return &sections[index & ~TARGET_PAGE_MASK];
+    return ret;
 }
 
 static void io_mem_init(void)