diff options
| author |   Jan Kiszka <jan.kiszka@web.de> | 2009-07-02 22:04:48 +0200 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-07-10 13:44:30 -0500 |
| commit | d9db889faf1bea70d36e31231bf324ae009c6344 (patch) | |
| tree | 381d728eafc27d5d71a4b55490d85ab72a3aea97 /target-i386 | |
| parent | qemu/virtio: mark msi vectors used on load (diff) | |
| download | qemu-kvm-d9db889faf1bea70d36e31231bf324ae009c6344.tar.gz qemu-kvm-d9db889faf1bea70d36e31231bf324ae009c6344.tar.bz2 qemu-kvm-d9db889faf1bea70d36e31231bf324ae009c6344.zip | |
kvm: Work around borken MSR_GET_INDEX_LIST
Allocate enough memory for KVM_GET_MSR_INDEX_LIST as older kernels shot
far beyond their limits, corrupting user space memory.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 4a3f598e4..cab9fccae 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -239,8 +239,11 @@ static int kvm_has_msr_star(CPUState *env) if (ret < 0) return 0; - kvm_msr_list = qemu_mallocz(sizeof(msr_list) + - msr_list.nmsrs * sizeof(msr_list.indices[0])); + /* Old kernel modules had a bug and could write beyond the provided + memory. Allocate at least a safe amount of 1K. */ + kvm_msr_list = qemu_mallocz(MAX(1024, sizeof(msr_list) + + msr_list.nmsrs * + sizeof(msr_list.indices[0]))); kvm_msr_list->nmsrs = msr_list.nmsrs; ret = kvm_ioctl(env->kvm_state, KVM_GET_MSR_INDEX_LIST, kvm_msr_list); |