yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uc_mem_map(): enforce address & size to be aligned to 4KB. this fixes bunch of regress tests in regress/

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2015-08-26 11:29:14 +08:00
parent e1b8bc2ed0
commit 70cdbf8c69
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
uc.c
View File

@ -535,7 +535,6 @@ UNICORN_EXPORT
uc_err uc_mem_map(uch handle, uint64_t address, size_t size)
{
struct uc_struct* uc = (struct uc_struct *)handle;
size_t s;
if (handle == 0)
// invalid handle
@ -545,11 +544,17 @@ uc_err uc_mem_map(uch handle, uint64_t address, size_t size)
// invalid memory mapping
return UC_ERR_MAP;
// align to 8KB boundary
map_begin[map_count] = address & (~ (8*1024 - 1));
s = (size + 8*1024 - 1) & (~ (8*1024 - 1));
map_end[map_count] = s + map_begin[map_count];
uc->memory_map(uc, map_begin[map_count], s);
// address must be aligned to 4KB
if ((address & (4*1024 - 1)) != 0)
return UC_ERR_MAP;
// size must be multiple of 4KB
if ((size & (4*1024 - 1)) != 0)
return UC_ERR_MAP;
map_begin[map_count] = address;
map_end[map_count] = size + map_begin[map_count];
uc->memory_map(uc, map_begin[map_count], size);
map_count++;
return UC_ERR_OK;