提交 997b0412 编写于 作者: P Paolo Bonzini

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: NPaolo Bonzini <pbonzini@redhat.com>
上级 01485a22
...@@ -654,20 +654,15 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, ...@@ -654,20 +654,15 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
if (!fetch && (desc.type & 8) && !(desc.type & 2)) if (!fetch && (desc.type & 8) && !(desc.type & 2))
goto bad; goto bad;
lim = desc_limit_scaled(&desc); lim = desc_limit_scaled(&desc);
if ((desc.type & 8) || !(desc.type & 4)) { 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 {
/* expand-down segment */ /* expand-down segment */
if (addr.ea <= lim) if (addr.ea <= lim)
goto bad; goto bad;
lim = desc.d ? 0xffffffff : 0xffff; lim = desc.d ? 0xffffffff : 0xffff;
if (addr.ea > lim)
goto bad;
*max_size = min_t(u64, ~0u, (u64)lim + 1 - addr.ea);
} }
if (addr.ea > lim)
goto bad;
*max_size = min_t(u64, ~0u, (u64)lim + 1 - addr.ea);
if (size > *max_size) if (size > *max_size)
goto bad; goto bad;
la &= (u32)-1; la &= (u32)-1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册