Skip to contentSkip to conversation

kvm: x86: Fix initial kvm_has_msr_star

PATCH In review Jan Kiszka 3 participants 9 messages Dec 6, 2009 – Dec 7, 2009

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 kvm: x86: Fix initial kvm_has_msr_star

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

---

 target-i386/kvm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
target-i386/kvm.c +2 -2
index 3b61a7f..88b504c 100644
@@ -244,9 +244,9 @@ static int kvm_has_msr_star(CPUState *env)
          * save/restore */
         msr_list.nmsrs = 0;
         ret = kvm_ioctl(env->kvm_state, KVM_GET_MSR_INDEX_LIST, &msr_list);
-        if (ret < 0)
+        if (ret < 0 && ret != -E2BIG) {
             return 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) +
author
#1 lore raw

PATCH 1/1 kvm: x86: Fix initial kvm_has_msr_star

Sorry, this is of course a critical fix for all branches that have KVM support.

Jan

Quoted 31 lines · Jan Kiszka

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

---

 target-i386/kvm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
target-i386/kvm.c +2 -2
index 3b61a7f..88b504c 100644
@@ -244,9 +244,9 @@ static int kvm_has_msr_star(CPUState *env)
          * save/restore */
         msr_list.nmsrs = 0;
         ret = kvm_ioctl(env->kvm_state, KVM_GET_MSR_INDEX_LIST, &msr_list);
-        if (ret < 0)
+        if (ret < 0 && ret != -E2BIG) {
             return 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) +
#2 lore raw
In reply to Jan Kiszka
Quoted 8 lines · Jan Kiszka

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

Strong ack. Anthony, please apply ASAP. This is worthy of a 0.11.2, IMO.

Signature · 1 line
error compiling committee.c: too many arguments to function
#3 lore raw
In reply to Jan Kiszka
Quoted 8 lines · Jan Kiszka

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

I applied this to qemu-kvm since it missed 0.12-rc1.

Signature · 1 line
error compiling committee.c: too many arguments to function
author
#4 lore raw
Quoted 5 lines · Avi Kivity
Quoted 4 lines · Jan Kiszka

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

Quoted 7 lines
Quoted 4 lines

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

I applied this to qemu-kvm since it missed 0.12-rc1.

OK, but this part is unused in qemu-kvm as we use our own (unaffected) implementation there so far.

Jan

#5 lore raw
Quoted 7 lines · Jan Kiszka
Quoted 4 lines

I applied this to qemu-kvm since it missed 0.12-rc1.

OK, but this part is unused in qemu-kvm as we use our own (unaffected) implementation there so far.

#include <toldyouso.h>

Will unapply.

Signature · 1 line
error compiling committee.c: too many arguments to function
#6 lore raw
In reply to Avi Kivity
Quoted 11 lines · Avi Kivity
Quoted 8 lines · Jan Kiszka

KVM_GET_MSR_INDEX_LIST returns -E2BIG when the provided space is too small for all MSRs. But this is precisely the error we trigger with the initial request in order to obtain that size. Do not fail in that case.

This caused a subtle corruption of the guest state as MSR_STAR was not properly saved/restored. The corruption became visible with latest kvm optimizing the MSR updates.

I applied this to qemu-kvm since it missed 0.12-rc1.

I've got it in my tree. It will be a part of 0.12-rc2 and I'll push to master today.

Don't know when 0.11.2 will happen but I'll also push it to the stable-0.11 branch.

Signature · 3 lines
Regards,

Anthony Liguori
#7 lore raw
Quoted 3 lines · Anthony Liguori

Don't know when 0.11.2 will happen but I'll also push it to the stable-0.11 branch.

I think this is worthy of a 0.11.2 all by itself.

Signature · 1 line
error compiling committee.c: too many arguments to function
#8 lore raw
Quoted 6 lines · Avi Kivity
Quoted 3 lines · Anthony Liguori

Don't know when 0.11.2 will happen but I'll also push it to the stable-0.11 branch.

I think this is worthy of a 0.11.2 all by itself.

Understood. I'll see what I can do today.

Signature · 3 lines
Regards,

Anthony Liguori