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

Commit 895e1fc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: Fix off-by-one when writing to a nonpae guest pde
parents ac57b3a9 6b8d0f9b

drivers/kvm/mmu.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1171,6 +1171,7 @@ void kvm_mmu_pre_write(struct kvm_vcpu *vcpu, gpa_t gpa, int bytes) 
			 * and zap two pdes instead of one.

			 * and zap two pdes instead of one.

			 */

			 */

			if (level == PT32_ROOT_LEVEL) {

			if (level == PT32_ROOT_LEVEL) {

				page_offset &= ~7; /* kill rounding error */

				page_offset <<= 1;

				page_offset <<= 1;

				npte = 2;

				npte = 2;

			}

			}