X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=b21dc855bf158f6af47f8649c11ac85ddb4401e1;hb=9dd0a80f28ca47a1fb69992dcd96e7526bf5175c;hp=69d51ffab62e464b8695138e8693415ac1859ee4;hpb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;p=palacios.git diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index 69d51ff..b21dc85 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -1,4 +1,4 @@ -#include + #include #include #include #include @@ -10,80 +10,6 @@ extern void SerialMemDump(unsigned char *start, int n); -#if VMM_DEBUG -void PrintCtrlRegs(struct guest_info *info) -{ - struct cr0_32 cr0 = *((struct cr0_32 *) &(info->ctrl_regs.cr0)); - struct cr2_32 cr2 = *((struct cr2_32 *) &(info->ctrl_regs.cr2)); - struct cr3_32 cr3 = *((struct cr3_32 *) &(info->ctrl_regs.cr3)); - struct cr4_32 cr4 = *((struct cr4_32 *) &(info->ctrl_regs.cr4)); - struct rflags rflags = *((struct rflags *) &(info->ctrl_regs.rflags)); - - PrintDebug("CR0: pe 0x%x\n",cr0.pe); - PrintDebug("CR0: mp 0x%x\n",cr0.mp); - PrintDebug("CR0: em 0x%x\n",cr0.em); - PrintDebug("CR0: ts 0x%x\n",cr0.ts); - PrintDebug("CR0: et 0x%x\n",cr0.et); - PrintDebug("CR0: ne 0x%x\n",cr0.ne); - PrintDebug("CR0: rsvd1 0x%x\n",cr0.rsvd1); - PrintDebug("CR0: wp 0x%x\n",cr0.wp); - PrintDebug("CR0: rsvd2 0x%x\n",cr0.rsvd2); - PrintDebug("CR0: am 0x%x\n",cr0.am); - PrintDebug("CR0: rsvd3 0x%x\n",cr0.rsvd3); - PrintDebug("CR0: nw 0x%x\n",cr0.nw); - PrintDebug("CR0: cd 0x%x\n",cr0.cd); - PrintDebug("CR0: pg 0x%x\n",cr0.pg); - - PrintDebug("CR2: pfadd 0x%x\n",cr2.pf_vaddr); - - PrintDebug("CR3: rsvd1 0x%x\n",cr3.rsvd1); - PrintDebug("CR3: pwt 0x%x\n",cr3.pwt); - PrintDebug("CR3: pcd 0x%x\n",cr3.pcd); - PrintDebug("CR3: rsvd2 0x%x\n",cr3.rsvd2); - PrintDebug("CR3: pdt 0x%x\n",cr3.pdt_base_addr); - - PrintDebug("CR4: vme 0x%x\n",cr4.vme); - PrintDebug("CR4: pvi 0x%x\n",cr4.pvi); - PrintDebug("CR4: tsd 0x%x\n",cr4.tsd); - PrintDebug("CR4: de 0x%x\n",cr4.de); - PrintDebug("CR4: pse 0x%x\n",cr4.pse); - PrintDebug("CR4: pae 0x%x\n",cr4.pae); - PrintDebug("CR4: mce 0x%x\n",cr4.mce); - PrintDebug("CR4: pge 0x%x\n",cr4.pge); - PrintDebug("CR4: pce 0x%x\n",cr4.pce); - PrintDebug("CR4: osfx 0x%x\n",cr4.osf_xsr); - PrintDebug("CR4: osx 0x%x\n",cr4.osx); - PrintDebug("CR4: rsvd1 0x%x\n",cr4.rsvd1); - - PrintDebug("RFLAGS: cf 0x%x\n",rflags.cf); - PrintDebug("RFLAGS: rsvd1 0x%x\n",rflags.rsvd1); - PrintDebug("RFLAGS: pf 0x%x\n",rflags.pf); - PrintDebug("RFLAGS: rsvd2 0x%x\n",rflags.rsvd2); - PrintDebug("RFLAGS: af 0x%x\n",rflags.af); - PrintDebug("RFLAGS: rsvd3 0x%x\n",rflags.rsvd3); - PrintDebug("RFLAGS: zf 0x%x\n",rflags.zf); - PrintDebug("RFLAGS: sf 0x%x\n",rflags.sf); - PrintDebug("RFLAGS: tf 0x%x\n",rflags.tf); - PrintDebug("RFLAGS: intr 0x%x\n",rflags.intr); - PrintDebug("RFLAGS: df 0x%x\n",rflags.df); - PrintDebug("RFLAGS: of 0x%x\n",rflags.of); - PrintDebug("RFLAGS: iopl 0x%x\n",rflags.iopl); - PrintDebug("RFLAGS: nt 0x%x\n",rflags.nt); - PrintDebug("RFLAGS: rsvd4 0x%x\n",rflags.rsvd4); - PrintDebug("RFLAGS: rf 0x%x\n",rflags.rf); - PrintDebug("RFLAGS: vm 0x%x\n",rflags.vm); - PrintDebug("RFLAGS: ac 0x%x\n",rflags.ac); - PrintDebug("RFLAGS: vif 0x%x\n",rflags.vif); - PrintDebug("RFLAGS: id 0x%x\n",rflags.id); - PrintDebug("RFLAGS: rsvd5 0x%x\n",rflags.rsvd5); - PrintDebug("RFLAGS: rsvd6 0x%x\n",rflags.rsvd6); - -} -#else -void PrintCtrlRegs(struct guest_info *info) -{} -#endif - /* Segmentation is a problem here... * * When we get a memory operand, presumably we use the default segment (which is?) @@ -91,6 +17,11 @@ void PrintCtrlRegs(struct guest_info *info) */ +#ifndef VMM_CTRL_REGS +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + int handle_cr0_write(struct guest_info * info) { char instr[15]; @@ -103,6 +34,8 @@ int handle_cr0_write(struct guest_info * info) { PrintDebug("Real Mode write to CR0 at linear guest pa 0x%x\n",get_addr_linear(info,info->rip,&(info->segments.cs))); + //PrintV3Segments(info); + // The real rip address is actually a combination of the rip + CS base ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); if (ret != 15) { @@ -112,6 +45,19 @@ int handle_cr0_write(struct guest_info * info) { } while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } index++; } @@ -146,7 +92,7 @@ int handle_cr0_write(struct guest_info * info) { new_cr0 = (struct cr0_real *)host_addr; } else { - PrintDebug("Memory operand in real mode write to CR0 is UNIMPLEMENTED\n"); + // error... don't know what to do return -1; } @@ -157,7 +103,7 @@ int handle_cr0_write(struct guest_info * info) { info->cpu_mode = REAL; } - new_cr0_val = *(char*)(new_cr0) & 0x0f; + new_cr0_val = (*(char*)(new_cr0)) & 0x0f; if (info->shdw_pg_mode == SHADOW_PAGING) { @@ -228,12 +174,22 @@ int handle_cr0_write(struct guest_info * info) { } - if (new_cr0->pg == 1) { + + if ((new_cr0->pg == 1) && (new_cr0->pe == 1)) { PrintDebug("Paging is already turned on in switch to protected mode in CR0 write\n"); + // Actually This appears to be Ok. + // Why shouldn't windows be allowed to switch to real mode whenever it wants to modify its page tables? + + info->mem_mode = VIRTUAL_MEM; + // GPF the guest?? + // return -1; + } else if ((new_cr0->pg == 1) && (new_cr0->pe == 0)) { + PrintDebug("Will the madness Never End??\n"); return -1; } + if (info->shdw_pg_mode == SHADOW_PAGING) { struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); @@ -246,6 +202,12 @@ int handle_cr0_write(struct guest_info * info) { *shadow_cr0 = *new_cr0; shadow_cr0->et = 1; + // Setup the page tables...??? + if (info->mem_mode == VIRTUAL_MEM) { + // If we aren't in paged mode then we have to preserve the identity mapped CR3 + info->ctrl_regs.cr3 = *(addr_t*)&(info->shdw_pg_state.shadow_cr3); + } + PrintDebug("New CR0=%x, New Shadow CR0=%x\n", *real_cr0, *shadow_cr0); } else { PrintDebug("Old CR0=%x\n", *real_cr0); @@ -292,10 +254,30 @@ int handle_cr0_write(struct guest_info * info) { return -1; } + while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } index++; } + /* + while (is_prefix_byte(instr[index])) { + index++; + } + */ + struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); struct cr0_32 * real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); @@ -312,10 +294,11 @@ int handle_cr0_write(struct guest_info * info) { index += 2; - PrintDebug("MovToCR0 instr:\n"); - PrintTraceMemDump(instr, 15); - PrintDebug("EAX=%x\n", *(uint_t*)&(info->vm_regs.rax)); - + /* + PrintDebug("MovToCR0 instr:\n"); + PrintTraceMemDump(instr, 15); + PrintDebug("EAX=%x\n", *(uint_t*)&(info->vm_regs.rax)); + */ addr_type = decode_operands32(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32); if (addr_type != REG_OPERAND) { @@ -325,7 +308,7 @@ int handle_cr0_write(struct guest_info * info) { new_cr0 = (struct cr0_32 *)first_operand; - PrintDebug("first operand=%x\n", *(uint_t *)first_operand); + //PrintDebug("first operand=%x\n", *(uint_t *)first_operand); if (info->shdw_pg_mode == SHADOW_PAGING) { struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); @@ -356,15 +339,14 @@ int handle_cr0_write(struct guest_info * info) { info->mem_mode = PHYSICAL_MEM; PrintDebug("Entering Real Mode\n"); - PrintV3CtrlRegs(&(info->ctrl_regs)); + //PrintV3CtrlRegs(info); // reinstate the identity mapped paged tables // But keep the shadow tables around to handle TLB issues.... UGH... //info->shdw_pg_state.shadow_cr3 &= 0x00000fff; //info->shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pde32_pts(info) & ~0xfff); //info->ctrl_regs.cr3 = info->shdw_pg_state.shadow_cr3; - info->ctrl_regs.cr3 = ((addr_t)create_passthrough_pde32_pts(info) & ~0xfff); - + info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt); *shadow_cr0 = *new_cr0; *real_cr0 = *new_cr0; @@ -372,14 +354,100 @@ int handle_cr0_write(struct guest_info * info) { shadow_cr0->et = 1; real_cr0->et = 1; + //PrintV3CtrlRegs(info); + } } else { + if (new_cr0->pg == 1) { + info->mem_mode = VIRTUAL_MEM; + } else if (new_cr0->pg == 0) { + info->cpu_mode = REAL; + info->mem_mode = PHYSICAL_MEM; + } + *real_cr0 = *new_cr0; } info->rip += index; + } else if ((instr[index] == cr_access_byte) && + (instr[index + 1] == lmsw_byte) && + (MODRM_REG(instr[index + 2]) == lmsw_reg_byte)) { + addr_t first_operand; + addr_t second_operand; + struct cr0_real *real_cr0; + struct cr0_real *new_cr0; + operand_type_t addr_type; + char new_cr0_val = 0; + + index += 2; + + real_cr0 = (struct cr0_real*)&(info->ctrl_regs.cr0); + + addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG16); + + if (addr_type == REG_OPERAND) { + new_cr0 = (struct cr0_real *)first_operand; + } else if (addr_type == MEM_OPERAND) { + addr_t host_addr; + // check segment descriptors.... + + /* TODO, TODO, TODO: Lookup segment overrides */ + struct v3_segment *lmsw_segment = &(info->segments.ds); + + if (info->mem_mode == PHYSICAL_MEM) { + if (guest_pa_to_host_va(info, get_addr_linear(info, first_operand, lmsw_segment), &host_addr) == -1) { + return -1; + } + } else { + if (guest_va_to_host_va(info, get_addr_linear(info, first_operand, lmsw_segment), &host_addr) == -1) { + return -1; + } + } + + new_cr0 = (struct cr0_real *)host_addr; + } else { + return -1; + } + + + if (new_cr0->pe == 0) { + // According to the intel manual this it is illegal to use + // lmsw to turn _off_ Protected mode + PrintDebug("Cannot switch to real mode with LMSW, unclear what to do\n"); + return -1; + } + + new_cr0_val = (*(char *)(new_cr0)) & 0x0f; + + + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_real * shadow_cr0 = (struct cr0_real*)&(info->shdw_pg_state.guest_cr0); + + PrintDebug("Old CR0=%x, Old Shadow CR0=%x\n", *real_cr0, *shadow_cr0); + /* struct cr0_real is only 4 bits wide, + * so we can overwrite the real_cr0 without worrying about the shadow fields + */ + *(char*)real_cr0 &= 0xf0; + *(char*)real_cr0 |= new_cr0_val; + + *(char*)shadow_cr0 &= 0xf0; + *(char*)shadow_cr0 |= new_cr0_val; + + + PrintDebug("New CR0=%x, New Shadow CR0=%x\n", *real_cr0, *shadow_cr0); + } else { + PrintDebug("Old CR0=%x\n", *real_cr0); + // for now we just pass through.... + *(char*)real_cr0 &= 0xf0; + *(char*)real_cr0 |= new_cr0_val; + + PrintDebug("New CR0=%x\n", *real_cr0); + } + + info->rip += index; + } else if ((instr[index] == 0x0f) && (instr[index + 1] == 0x06)) { @@ -433,6 +501,7 @@ int handle_cr0_read(struct guest_info * info) { int ret; PrintDebug("Real Mode read from CR0 at linear guest pa 0x%x\n",get_addr_linear(info,info->rip,&(info->segments.cs))); + //PrintV3Segments(info); // The real rip address is actually a combination of the rip + CS base ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); @@ -444,9 +513,28 @@ int handle_cr0_read(struct guest_info * info) { while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } index++; } + /* + while (is_prefix_byte(instr[index])) { + index++; + } + */ + if ((instr[index] == cr_access_byte) && (instr[index + 1] == smsw_byte) && (MODRM_REG(instr[index + 2]) == smsw_reg_byte)) { @@ -552,6 +640,12 @@ int handle_cr0_read(struct guest_info * info) { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } + + /* + PrintDebug("Instr (15 bytes) at %x:\n", instr); + PrintTraceMemDump((char*)instr, 15); + */ + if (ret != 15) { // I think we should inject a GPF into the guest PrintDebug("Could not read Protected %s mode instruction (ret=%d)\n", @@ -559,11 +653,31 @@ int handle_cr0_read(struct guest_info * info) { return -1; } + while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } index++; } + /* + while (is_prefix_byte(instr[index])) { + index++; + } + */ + if ((instr[index] == cr_access_byte) && (instr[index+1] == mov_from_cr_byte)) { @@ -592,14 +706,13 @@ int handle_cr0_read(struct guest_info * info) { if (info->mem_mode == PHYSICAL_MEM) { virt_cr0->pg = 0; // clear the pg bit because guest doesn't think it's on } - - PrintDebug("real CR0: %x\n", *(uint_t*)real_cr0); - PrintDebug("returned CR0: %x\n", *(uint_t*)virt_cr0); - } else { *virt_cr0 = *real_cr0; } + + PrintDebug("real CR0: %x\n", *(uint_t*)real_cr0); + PrintDebug("returned CR0: %x\n", *(uint_t*)virt_cr0); info->rip += index; @@ -635,7 +748,124 @@ int handle_cr0_read(struct guest_info * info) { int handle_cr3_write(struct guest_info * info) { - if (info->cpu_mode == PROTECTED) { + if (info->cpu_mode == REAL) { + // WHAT THE HELL DOES THIS EVEN MEAN????? + + int index = 0; + int ret; + char instr[15]; + + PrintDebug("Real Mode Write to CR3.\n"); + // We need to read the instruction, which is at CS:IP, but that + // linear address is guest physical without PG and guest virtual with PG + + ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); + + if (ret != 15) { + PrintDebug("Could not read instruction (ret=%d)\n", ret); + return -1; + } + + while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } + index++; + } + + + if ((instr[index] == cr_access_byte) && + (instr[index + 1] == mov_to_cr_byte)) { + + addr_t first_operand; + addr_t second_operand; + struct cr3_32 * new_cr3; + // struct cr3_32 * real_cr3; + operand_type_t addr_type; + + index += 2; + + addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32); + + if (addr_type != REG_OPERAND) { + /* Mov to CR3 can only be a 32 bit register */ + return -1; + } + + new_cr3 = (struct cr3_32 *)first_operand; + + if (info->shdw_pg_mode == SHADOW_PAGING) { + addr_t shadow_pt; + struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3); + struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3); + + /* + + if (CR3_TO_PDE32(*(uint_t*)shadow_cr3) != 0) { + PrintDebug("Shadow Page Table\n"); + PrintDebugPageTables((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3)); + } + */ + + /* Delete the current Page Tables */ + delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3)); + + PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", + *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3); + + + *guest_cr3 = *new_cr3; + + + + // Something like this + shadow_pt = create_new_shadow_pt32(info); + //shadow_pt = setup_shadow_pt32(info, CR3_TO_PDE32(*(addr_t *)new_cr3)); + + /* Copy Various flags */ + *shadow_cr3 = *new_cr3; + + /* + { + addr_t tmp_addr; + guest_pa_to_host_va(info, ((*(uint_t*)guest_cr3) & 0xfffff000), &tmp_addr); + PrintDebug("Guest PD\n"); + PrintPD32((pde32_t *)tmp_addr); + + } + */ + + + shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt); + + PrintDebug("New Shadow CR3=%x; New Guest CR3=%x\n", + *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3); + + + + + } + info->rip += index; + + } else { + PrintDebug("Unknown Instruction\n"); + SerialMemDump(instr,15); + return -1; + } + + + + } else if (info->cpu_mode == PROTECTED) { int index = 0; int ret; char instr[15]; @@ -649,10 +879,10 @@ int handle_cr3_write(struct guest_info * info) { // linear address is guest physical without PG and guest virtual with PG if (info->mem_mode == PHYSICAL_MEM) { // The real rip address is actually a combination of the rip + CS base - PrintDebug("Writing Guest CR3 Write (Physical Address)\n"); + //PrintDebug("Writing Guest CR3 Write (Physical Address)\n"); ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } else { - PrintDebug("Writing Guest CR3 Write (Virtual Address)\n"); + //PrintDebug("Writing Guest CR3 Write (Virtual Address)\n"); // The real rip address is actually a combination of the rip + CS base ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } @@ -661,10 +891,29 @@ int handle_cr3_write(struct guest_info * info) { PrintDebug("Could not read instruction (ret=%d)\n", ret); return -1; } - + while (is_prefix_byte(instr[index])) { - index++; + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } + index++; } + + /* + while (is_prefix_byte(instr[index])) { + index++; + } + */ if ((instr[index] == cr_access_byte) && (instr[index + 1] == mov_to_cr_byte)) { @@ -692,10 +941,12 @@ int handle_cr3_write(struct guest_info * info) { struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3); + /* if (CR3_TO_PDE32(*(uint_t*)shadow_cr3) != 0) { PrintDebug("Shadow Page Table\n"); PrintDebugPageTables((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3)); } + */ /* Delete the current Page Tables */ delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3)); @@ -715,6 +966,7 @@ int handle_cr3_write(struct guest_info * info) { /* Copy Various flags */ *shadow_cr3 = *new_cr3; + /* { addr_t tmp_addr; guest_pa_to_host_va(info, ((*(uint_t*)guest_cr3) & 0xfffff000), &tmp_addr); @@ -722,7 +974,7 @@ int handle_cr3_write(struct guest_info * info) { PrintPD32((pde32_t *)tmp_addr); } - + */ shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt); @@ -759,34 +1011,76 @@ int handle_cr3_write(struct guest_info * info) { int handle_cr3_read(struct guest_info * info) { if (info->cpu_mode == REAL) { - // what does this mean??? - - /* - - addr_t host_addr; + char instr[15]; + int ret; + int index = 0; addr_t linear_addr = 0; - - linear_addr = get_addr_linear(info, info->rip, &(info->segments.cs)); - PrintDebug("RIP Linear: %x\n", linear_addr); - PrintV3Segments(&(info->segments)); + //PrintDebug("RIP Linear: %x\n", linear_addr); + //PrintV3Segments(info); - - if (info->mem_mode == PHYSICAL_MEM) { - guest_pa_to_host_pa(info, linear_addr, &host_addr); - } else if (info->mem_mode == VIRTUAL_MEM) { - guest_va_to_host_pa(info, linear_addr, &host_addr); + ret = read_guest_pa_memory(info, linear_addr, 15, instr); + + if (ret != 15) { + PrintDebug("Could not read instruction (ret=%d)\n", ret); + return -1; + } + + while (is_prefix_byte(instr[index])) { + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } + index++; } - pt32_lookup((pde32_t *)CR3_TO_PDE32(info->shdw_pg_state.shadow_cr3), , addr_t * paddr); - */ + if ((instr[index] == cr_access_byte) && + (instr[index + 1] == mov_from_cr_byte)) { + addr_t first_operand; + addr_t second_operand; + struct cr3_32 * virt_cr3; + struct cr3_32 * real_cr3 = (struct cr3_32 *)&(info->ctrl_regs.cr3); + operand_type_t addr_type; + index += 2; - return -1; + addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32); + + if (addr_type != REG_OPERAND) { + /* Mov to CR3 can only be a 32 bit register */ + return -1; + } + + virt_cr3 = (struct cr3_32 *)first_operand; + + if (info->shdw_pg_mode == SHADOW_PAGING) { + *virt_cr3 = *(struct cr3_32 *)&(info->shdw_pg_state.guest_cr3); + } else { + *virt_cr3 = *real_cr3; + } + + info->rip += index; + } else { + PrintDebug("Unknown Instruction\n"); + SerialMemDump(instr,15); + return -1; + } + + + return 0; } else if (info->cpu_mode == PROTECTED) { int index = 0; @@ -810,9 +1104,28 @@ int handle_cr3_read(struct guest_info * info) { } while (is_prefix_byte(instr[index])) { - index++; + switch(instr[index]) { + case PREFIX_CS_OVERRIDE: + case PREFIX_SS_OVERRIDE: + case PREFIX_DS_OVERRIDE: + case PREFIX_ES_OVERRIDE: + case PREFIX_FS_OVERRIDE: + case PREFIX_GS_OVERRIDE: + PrintDebug("Segment Override!!\n"); + return -1; + break; + default: + break; + } + index++; } + /* + while (is_prefix_byte(instr[index])) { + index++; + } + */ + if ((instr[index] == cr_access_byte) && (instr[index + 1] == mov_from_cr_byte)) { addr_t first_operand; @@ -846,7 +1159,7 @@ int handle_cr3_read(struct guest_info * info) { } } else { PrintDebug("Invalid operating Mode (0x%x), control registers follow\n", info->cpu_mode); - PrintCtrlRegs(info); + PrintV3CtrlRegs(info); return -1; }