Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4482b06c authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: ia64: fix dirty_log_lock spin_lock section not to include get_dirty_log() 



kvm_get_dirty_log() calls copy_to_user(). So we need to narrow the
dirty_log_lock spin_lock section not to include this.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4d29bdbf

arch/ia64/kvm/kvm-ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -1817,10 +1817,12 @@ static int kvm_ia64_sync_dirty_log(struct kvm *kvm, 
	n = kvm_dirty_bitmap_bytes(memslot);

	base = memslot->base_gfn / BITS_PER_LONG;



	spin_lock(&kvm->arch.dirty_log_lock);

	for (i = 0; i < n/sizeof(long); ++i) {

		memslot->dirty_bitmap[i] = dirty_bitmap[base + i];

		dirty_bitmap[base + i] = 0;

	}

	spin_unlock(&kvm->arch.dirty_log_lock);

	r = 0;

out:

	return r;
@@ -1835,7 +1837,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
	int is_dirty = 0;



	mutex_lock(&kvm->slots_lock);

	spin_lock(&kvm->arch.dirty_log_lock);



	r = kvm_ia64_sync_dirty_log(kvm, log);

	if (r)
@@ -1855,7 +1856,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
	r = 0;

out:

	mutex_unlock(&kvm->slots_lock);

	spin_unlock(&kvm->arch.dirty_log_lock);

	return r;

}