mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the wrong block found when doing split_region

Browse Source
This commit is contained in:
lazymio 2022-02-12 21:34:46 +01:00
parent 3c4477d622
commit 96518634fb
No known key found for this signature in database
GPG Key ID: DFF27E34A47CB873
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/unit/test_mem.c
View File

@ -118,9 +118,36 @@ static void test_splitting_mmio_unmap()
OK(uc_close(uc));
}
static void test_mem_protect_map_ptr()
{
uc_engine *uc;
uint64_t val = 0x114514;
uint8_t *data1 = NULL;
uint8_t *data2 = NULL;
uint64_t mem;
data1 = calloc(sizeof(*data1), 0x4000);
data2 = calloc(sizeof(*data2), 0x2000);
OK(uc_open(UC_ARCH_X86, UC_MODE_64, &uc));
OK(uc_mem_map_ptr(uc, 0x4000, 0x4000, UC_PROT_ALL, data1));
OK(uc_mem_unmap(uc, 0x6000, 0x2000));
OK(uc_mem_map_ptr(uc, 0x6000, 0x2000, UC_PROT_ALL, data2));
OK(uc_mem_write(uc, 0x6004, &val, 8));
OK(uc_mem_protect(uc, 0x6000, 0x1000, UC_PROT_READ));
OK(uc_mem_read(uc, 0x6004, (void *)&mem, 8));
TEST_CHECK(val == mem);
OK(uc_close(uc));
}
TEST_LIST = {{"test_map_correct", test_map_correct},
{"test_map_wrapping", test_map_wrapping},
{"test_mem_protect", test_mem_protect},
{"test_splitting_mem_unmap", test_splitting_mem_unmap},
{"test_splitting_mmio_unmap", test_splitting_mmio_unmap},
{"test_mem_protect_map_ptr", test_mem_protect_map_ptr},
{NULL, NULL}};

4
uc.c
View File

@ -1198,11 +1198,13 @@ static bool split_region(struct uc_struct *uc, MemoryRegion *mr,
return false;
}
// Find the correct and large enough (which contains our target mr)
// to create the content backup.
QLIST_FOREACH(block, &uc->ram_list.blocks, next)
{
// block->offset is the offset within ram_addr_t, not GPA
if (block->mr->addr <= mr->addr &&
block->used_length >= (mr->end - mr->addr)) {
block->used_length + block->mr->addr >= mr->end) {
break;
}
}