clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-05 21:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm: Fix protected mode code dump

Browse Source 
This patch fixes protected mode code dump not to take 16-bit segment selector
into account when calculating the guest flat address.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
Pekka Enberg
2015-06-01 16:39:39 +01:00
committed by Will Deacon
parent 9db5315b26
commit f326512a4b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kvm.c
+13 -4
View File
@@ -296,9 +296,18 @@ static inline uint64_t ip_flat_to_real(struct kvm *self, uint64_t ip)
return ip - (cs << 4);
}
static inline uint64_t ip_real_to_flat(struct kvm *self, uint64_t ip)
static inline uint64_t ip_to_flat(struct kvm *self, uint64_t ip)
{
uint64_t cs = self->sregs.cs.selector;
uint64_t cs;
/*
* NOTE! We should take code segment base address into account here.
* Luckily it's usually zero because Linux uses flat memory model.
*/
if (self->sregs.cr0 & 0x01)
return ip;
cs = self->sregs.cs.selector;
return ip + (cs << 4);
}
@@ -505,14 +514,14 @@ void kvm__show_code(struct kvm *self)
if (ioctl(self->vcpu_fd, KVM_GET_SREGS, &self->sregs) < 0)
die("KVM_GET_SREGS failed");
ip = guest_flat_to_host(self, ip_real_to_flat(self, self->regs.rip) - code_prologue);
ip = guest_flat_to_host(self, ip_to_flat(self, self->regs.rip) - code_prologue);
printf("Code: ");
for (i = 0; i < code_len; i++, ip++) {
c = *ip;
if (ip == guest_flat_to_host(self, ip_real_to_flat(self, self->regs.rip)))
if (ip == guest_flat_to_host(self, ip_to_flat(self, self->regs.rip)))
printf("<%02x> ", c);
else
printf("%02x ", c);