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

Commit 4be4de7e authored by Nadav Amit's avatar Nadav Amit Committed by Paolo Bonzini
Browse files

KVM: x86: Use new is_noncanonical_address in _linearize 



Replace the current canonical address check with the new function which is
identical.

Signed-off-by: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d09155d2

arch/x86/kvm/emulate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -658,7 +658,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, 
	*max_size = 0;

	*max_size = 0;

	switch (ctxt->mode) {

	switch (ctxt->mode) {

	case X86EMUL_MODE_PROT64:

	case X86EMUL_MODE_PROT64:

		if (((signed long)la << 16) >> 16 != la)

		if (is_noncanonical_address(la))

			return emulate_gp(ctxt, 0);

			return emulate_gp(ctxt, 0);





		*max_size = min_t(u64, ~0u, (1ull << 48) - la);

		*max_size = min_t(u64, ~0u, (1ull << 48) - la);