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

vtlb only cache access permisions required for the operation

Browse Source 
see #1845
This commit is contained in:
Takacs, Philipp
2023-07-13 10:28:41 +02:00
parent e88264c658
commit f6cfe1092b
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qemu/softmmu/unicorn_vtlb.c
View File

@@ -74,7 +74,20 @@ bool unicorn_fill_tlb(CPUState *cs, vaddr address, int size,
if (!handled) { if (!handled) {
e.paddr = address & TARGET_PAGE_MASK; e.paddr = address & TARGET_PAGE_MASK;
e.perms = UC_PROT_READ|UC_PROT_WRITE|UC_PROT_EXEC; switch (rw) {
case MMU_DATA_LOAD:
e.perms = UC_PROT_READ;
break;
case MMU_DATA_STORE:
e.perms = UC_PROT_WRITE;
break;
case MMU_INST_FETCH:
e.perms = UC_PROT_EXEC;
break;
default:
e.perms = 0;
break;
}
} }
switch (rw) { switch (rw) {

18
tests/unit/test_ctl.c
View File

@@ -383,6 +383,23 @@ static void test_tlb_clear(void)
OK(uc_close(uc)); OK(uc_close(uc));
} }
static void test_noexec(void)
{
uc_engine *uc;
/* mov al, byte ptr[rip]
* nop
*/
char code[] = "\x8a\x05\x00\x00\x00\x00\x90";
uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_64, code, sizeof(code) - 1);
OK(uc_ctl_tlb_mode(uc, UC_TLB_VIRTUAL));
OK(uc_mem_protect(uc, code_start, code_start + 0x1000, UC_PROT_EXEC));
uc_assert_err(UC_ERR_READ_PROT, uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
OK(uc_close(uc));
}
TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode}, TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode},
{"test_uc_ctl_page_size", test_uc_ctl_page_size}, {"test_uc_ctl_page_size", test_uc_ctl_page_size},
{"test_uc_ctl_arch", test_uc_ctl_arch}, {"test_uc_ctl_arch", test_uc_ctl_arch},
@@ -396,4 +413,5 @@ TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode},
{"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf}, {"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf},
{"test_uc_emu_stop_set_ip", test_uc_emu_stop_set_ip}, {"test_uc_emu_stop_set_ip", test_uc_emu_stop_set_ip},
{"test_tlb_clear", test_tlb_clear}, {"test_tlb_clear", test_tlb_clear},
{"test_noexec", test_noexec},
{NULL, NULL}}; {NULL, NULL}};