Browse Source

KVM: Fix wallclock version writing race

Wallclock writing uses an unprotected global variable to hold the version;
this can cause one guest to interfere with another if both write their
wallclock at the same time.

Acked-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Avi Kivity 15 years ago
parent
commit
9ed3c444ab
1 changed files with 10 additions and 2 deletions
  1. 10 2
      arch/x86/kvm/x86.c

+ 10 - 2
arch/x86/kvm/x86.c

@@ -754,14 +754,22 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
 
 
 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
 {
 {
-	static int version;
+	int version;
+	int r;
 	struct pvclock_wall_clock wc;
 	struct pvclock_wall_clock wc;
 	struct timespec boot;
 	struct timespec boot;
 
 
 	if (!wall_clock)
 	if (!wall_clock)
 		return;
 		return;
 
 
-	version++;
+	r = kvm_read_guest(kvm, wall_clock, &version, sizeof(version));
+	if (r)
+		return;
+
+	if (version & 1)
+		++version;  /* first time write, random junk */
+
+	++version;
 
 
 	kvm_write_guest(kvm, wall_clock, &version, sizeof(version));
 	kvm_write_guest(kvm, wall_clock, &version, sizeof(version));