clear the TLB cache in uc_ctl_flush_tlb
uc_ctl_flush_tlb implies that the tlb is flushed. This change adds UC_CTL_TLB_FLUSH which clears the TLB and set the uc_ctl_flush_tlb alias to UC_CTL_TLB_FLUSH. Also adds a uc_ctl_flush_tb alias for UC_CTL_TB_FLUSH.
This commit is contained in:
@@ -338,6 +338,42 @@ static void test_uc_emu_stop_set_ip(void)
|
||||
OK(uc_close(uc));
|
||||
}
|
||||
|
||||
static bool test_tlb_clear_tlb(uc_engine *uc, uint64_t addr, uc_mem_type type, uc_tlb_entry *result, void *user_data)
|
||||
{
|
||||
size_t *tlbcount = (size_t*)user_data;
|
||||
*tlbcount += 1;
|
||||
result->paddr = addr;
|
||||
result->perms = UC_PROT_ALL;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void test_tlb_clear_syscall(uc_engine *uc, void *user_data)
|
||||
{
|
||||
OK(uc_ctl_flush_tlb(uc));
|
||||
}
|
||||
|
||||
static void test_tlb_clear(void)
|
||||
{
|
||||
uc_engine *uc;
|
||||
uc_hook hook1, hook2;
|
||||
size_t tlbcount = 0;
|
||||
char code[] = "\xa3\x00\x00\x20\x00\x00\x00\x00\x00\x0f\x05\xa3\x00\x00\x20\x00\x00\x00\x00\x00"; //movabs dword ptr [0x200000], eax; syscall; movabs dword ptr [0x200000], eax
|
||||
|
||||
uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_64, code, sizeof(code) - 1);
|
||||
OK(uc_mem_map(uc, 0x200000, 0x1000, UC_PROT_ALL));
|
||||
|
||||
OK(uc_ctl_tlb_mode(uc, UC_TLB_VIRTUAL));
|
||||
OK(uc_hook_add(uc, &hook1, UC_HOOK_TLB_FILL, test_tlb_clear_tlb, &tlbcount, 1, 0));
|
||||
OK(uc_hook_add(uc, &hook2, UC_HOOK_INSN, test_tlb_clear_syscall, NULL, 1, 0, UC_X86_INS_SYSCALL));
|
||||
|
||||
OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
|
||||
|
||||
TEST_CHECK(tlbcount == 4);
|
||||
|
||||
OK(uc_close(uc));
|
||||
}
|
||||
|
||||
|
||||
TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode},
|
||||
{"test_uc_ctl_page_size", test_uc_ctl_page_size},
|
||||
{"test_uc_ctl_arch", test_uc_ctl_arch},
|
||||
@@ -350,4 +386,5 @@ TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode},
|
||||
#endif
|
||||
{"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf},
|
||||
{"test_uc_emu_stop_set_ip", test_uc_emu_stop_set_ip},
|
||||
{"test_tlb_clear", test_tlb_clear},
|
||||
{NULL, NULL}};
|
||||
|
||||
Reference in New Issue
Block a user