Skip to content

Commit

Permalink
KVM: Fix wallclock version writing race
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Avi Kivity committed May 19, 2010
1 parent 8facbbf commit 9ed3c44
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 int version;
int version;
int r;
struct pvclock_wall_clock wc;
struct timespec boot;

if (!wall_clock)
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));

Expand Down

0 comments on commit 9ed3c44

Please sign in to comment.