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

Commit 997b0412 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: emulator: remove duplicated limit check 



The check on the higher limit of the segment, and the check on the
maximum accessible size, is the same for both expand-up and
expand-down segments.  Only the computation of "lim" varies.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 01485a22

arch/x86/kvm/emulate.c

+4 −9
Original line number Diff line number Diff line
@@ -654,20 +654,15 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, 
		if (!fetch && (desc.type & 8) && !(desc.type & 2))

			goto bad;

		lim = desc_limit_scaled(&desc);

		if ((desc.type & 8) || !(desc.type & 4)) {

			/* expand-up segment */

			if (addr.ea > lim)

				goto bad;

			*max_size = min_t(u64, ~0u, (u64)lim + 1 - addr.ea);

		} else {

		if (!(desc.type & 8) && (desc.type & 4)) {

			/* expand-down segment */

			if (addr.ea <= lim)

				goto bad;

			lim = desc.d ? 0xffffffff : 0xffff;

		}

		if (addr.ea > lim)

			goto bad;

		*max_size = min_t(u64, ~0u, (u64)lim + 1 - addr.ea);

		}

		if (size > *max_size)

			goto bad;

		la &= (u32)-1;