Skip to contentSkip to conversation

memory: Initialize MemoryRegionOps for RAM memory regions

PATCH In review Philippe Mathieu-Daudé 2 participants 4 messages Aug 16, 2020 – Aug 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 memory: Initialize MemoryRegionOps for RAM memory regions

There is an issue when using memory_region_dispatch_read() or memory_region_dispatch_write() on RAM memory regions.

RAM memory regions are initialized as:

  memory_region_init_ram()
  -> memory_region_init_ram_nomigrate()
     -> memory_region_init_ram_shared_nomigrate()
        -> memory_region_init()
           -> object_initialize(TYPE_MEMORY_REGION)
              -> memory_region_initfn()
                 -> mr->ops = &unassigned_mem_ops;

Later when accessing the alias, the memory_region_dispatch_read() flow is:

memory_region_dispatch_read()
-> memory_region_dispatch_read1()

     -> if (mr->ops->read) { ... }
                   ^^^^^^
                   NULL deref as unassigned_mem_ops.read is NULL.

memory_region_dispatch_write()
-> if (mr->ops->write) { ... }
^^^^^^^
NULL deref as unassigned_mem_ops.read is NULL.

Fix by initializing the MemoryRegionOps to ram_device_mem_ops, this way the memory accesses are properly dispatched using memory_region_ram_device_read() / memory_region_ram_device_write().

Fixes 4a2e242bbb ("memory: Don't use memcpy for ram_device regions")
---
 softmmu/memory.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
softmmu/memory.c +10 -0
index af25987518..2fce3fef2d 100644
@@ -1509,6 +1509,8 @@ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc(size, share, mr, &err);
@@ -1533,6 +1535,8 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_resizeable(size, max_size, resized,
@@ -1558,6 +1562,8 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->align = align;
@@ -1581,6 +1587,8 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_from_fd(size, mr,
@@ -1603,6 +1611,8 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
 {
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
Signature · 1 line
2.21.3
#1 lore raw

+Prasad

Quoted 87 lines · Philippe Mathieu-Daudé

There is an issue when using memory_region_dispatch_read() or memory_region_dispatch_write() on RAM memory regions.

RAM memory regions are initialized as:

  memory_region_init_ram()
  -> memory_region_init_ram_nomigrate()
     -> memory_region_init_ram_shared_nomigrate()
        -> memory_region_init()
           -> object_initialize(TYPE_MEMORY_REGION)
              -> memory_region_initfn()
                 -> mr->ops = &unassigned_mem_ops;

Later when accessing the alias, the memory_region_dispatch_read() flow is:

memory_region_dispatch_read()
-> memory_region_dispatch_read1()

     -> if (mr->ops->read) { ... }
                   ^^^^^^
                   NULL deref as unassigned_mem_ops.read is NULL.

memory_region_dispatch_write()
-> if (mr->ops->write) { ... }
^^^^^^^
NULL deref as unassigned_mem_ops.read is NULL.

Fix by initializing the MemoryRegionOps to ram_device_mem_ops, this way the memory accesses are properly dispatched using memory_region_ram_device_read() / memory_region_ram_device_write().

Fixes 4a2e242bbb ("memory: Don't use memcpy for ram_device regions")
---
 softmmu/memory.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
softmmu/memory.c +10 -0
index af25987518..2fce3fef2d 100644
@@ -1509,6 +1509,8 @@ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc(size, share, mr, &err);
@@ -1533,6 +1535,8 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_resizeable(size, max_size, resized,
@@ -1558,6 +1562,8 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->align = align;
@@ -1581,6 +1587,8 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
     Error *err = NULL;
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_from_fd(size, mr,
@@ -1603,6 +1611,8 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
 {
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
+    mr->ops = &ram_device_mem_ops;
+    mr->opaque = mr;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
#2 lore raw
+-- On Mon, 17 Aug 2020, Philippe Mathieu-Daudé wrote --+
| On 8/16/20 8:26 PM, Philippe Mathieu-Daudé wrote:
| > There is an issue when using memory_region_dispatch_read() or
| > memory_region_dispatch_write() on RAM memory regions.
| > 
| > RAM memory regions are initialized as:
| > 
| >   memory_region_init_ram()
| >   -> memory_region_init_ram_nomigrate()
| >      -> memory_region_init_ram_shared_nomigrate()
| >         -> memory_region_init()
| >            -> object_initialize(TYPE_MEMORY_REGION)
| >               -> memory_region_initfn()
| >                  -> mr->ops = &unassigned_mem_ops;
| > 
| > Later when accessing the alias, the memory_region_dispatch_read()
| > flow is:
| > 
| >   memory_region_dispatch_read()
| >   -> memory_region_dispatch_read1()
| >      -> if (mr->ops->read) { ... }
| >                    ^^^^^^
| >                    NULL deref as unassigned_mem_ops.read is NULL.
| > 
| >   memory_region_dispatch_write()
| >   -> if (mr->ops->write) { ... }
| >                 ^^^^^^^
| >                 NULL deref as unassigned_mem_ops.read is NULL.

* This check should pass/fail as normal I think. NULL dereference would happen on invoking mr->ops->read/write() call.

* When mr->ops->read/write==NULL, the dispatch_read/write function would go to the else section to call read/write_with_attrs()

const MemoryRegionOps unassigned_mem_ops = {
.valid.accepts = unassigned_mem_accepts,
.endianness = DEVICE_NATIVE_ENDIAN,
};

Maybe we define read/write_with_attrs in 'unassigned_mem_ops' above?

| > Fix by initializing the MemoryRegionOps to ram_device_mem_ops,
| > this way the memory accesses are properly dispatched using
| > memory_region_ram_device_read() / memory_region_ram_device_write().
| > 
| > Fixes: 4a2e242bbb ("memory: Don't use memcpy for ram_device regions")

Yes, this should be fine too.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
8685 545E B54C 486B C6EB 271E E285 8B5A F050 DE8D

#3 lore raw
Quoted 15 lines · P J P
+-- On Mon, 17 Aug 2020, Philippe Mathieu-Daudé wrote --+
| On 8/16/20 8:26 PM, Philippe Mathieu-Daudé wrote:
| > There is an issue when using memory_region_dispatch_read() or
| > memory_region_dispatch_write() on RAM memory regions.
| > 
| > RAM memory regions are initialized as:
| > 
| >   memory_region_init_ram()
| >   -> memory_region_init_ram_nomigrate()
| >      -> memory_region_init_ram_shared_nomigrate()
| >         -> memory_region_init()
| >            -> object_initialize(TYPE_MEMORY_REGION)
| >               -> memory_region_initfn()
| >                  -> mr->ops = &unassigned_mem_ops;
| > 
Quoted 8 lines
| > Later when accessing the alias, the memory_region_dispatch_read()
| > flow is:
| > 
| >   memory_region_dispatch_read()
| >   -> memory_region_dispatch_read1()
| >      -> if (mr->ops->read) { ... }
| >                    ^^^^^^
| >                    NULL deref as unassigned_mem_ops.read is NULL.

[*]

Quoted 11 lines
| > 
| >   memory_region_dispatch_write()
| >   -> if (mr->ops->write) { ... }
| >                 ^^^^^^^
| >                 NULL deref as unassigned_mem_ops.read is NULL.

* This check should pass/fail as normal I think. NULL dereference would happen on invoking mr->ops->read/write() call.

* When mr->ops->read/write==NULL, the dispatch_read/write function would go to the else section to call read/write_with_attrs()

Yes, this is where it crashes. The patch description (code flow) is incorrect here and in [*].

I'll respin, thanks!

Quoted 23 lines

const MemoryRegionOps unassigned_mem_ops = {
.valid.accepts = unassigned_mem_accepts,
.endianness = DEVICE_NATIVE_ENDIAN,
};

Maybe we define read/write_with_attrs in 'unassigned_mem_ops' above?

| > Fix by initializing the MemoryRegionOps to ram_device_mem_ops,
| > this way the memory accesses are properly dispatched using
| > memory_region_ram_device_read() / memory_region_ram_device_write().
| > 
| > Fixes: 4a2e242bbb ("memory: Don't use memcpy for ram_device regions")

Yes, this should be fine too.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
8685 545E B54C 486B C6EB 271E E285 8B5A F050 DE8D