summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2009-10-14 15:02:27 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-15 12:59:24 -0300
commite7e5448ba387adc20be1cf08411a5b526d684299 (patch)
tree7eca8b71633a809572ff559cdb7011e3786c6664 /qemu-kvm-x86.c
parentDrop kvm/bios/ tree (diff)
downloadqemu-kvm-e7e5448ba387adc20be1cf08411a5b526d684299.tar.gz
qemu-kvm-e7e5448ba387adc20be1cf08411a5b526d684299.tar.bz2
qemu-kvm-e7e5448ba387adc20be1cf08411a5b526d684299.zip
fix MSR_COUNT for kvm_arch_save_regs()
A new register was added to the load/save list on commit d283d5a65a2bdcc570065267be21848bd6fe3d78, but MSR_COUNT was not updated, leading to potential stack corruption on kvm_arch_save_regs(). The following registers are saved by kvm_arch_save_regs(): 1) MSR_IA32_SYSENTER_CS 2) MSR_IA32_SYSENTER_ESP 3) MSR_IA32_SYSENTER_EIP 4) MSR_STAR 5) MSR_IA32_TSC 6) MSR_VM_HSAVE_PA 7) MSR_CSTAR (x86_64 only) 8) MSR_KERNELGSBASE (x86_64 only) 9) MSR_FMASK (x86_64 only) 10) MSR_LSTAR (x86_64 only) Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
-rw-r--r--qemu-kvm-x86.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index fffcfd81a..475151d4b 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -842,9 +842,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
}
#ifdef TARGET_X86_64
-#define MSR_COUNT 9
+#define MSR_COUNT 10
#else
-#define MSR_COUNT 5
+#define MSR_COUNT 6
#endif
static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -986,6 +986,7 @@ void kvm_arch_load_regs(CPUState *env)
/* msrs */
n = 0;
+ /* Remember to increase MSR_COUNT if you add new registers below */
set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs);
set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp);
set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip);
@@ -1163,6 +1164,7 @@ void kvm_arch_save_regs(CPUState *env)
/* msrs */
n = 0;
+ /* Remember to increase MSR_COUNT if you add new registers below */
msrs[n++].index = MSR_IA32_SYSENTER_CS;
msrs[n++].index = MSR_IA32_SYSENTER_ESP;
msrs[n++].index = MSR_IA32_SYSENTER_EIP;