projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
78051e3
)
KVM: x86: em_ret_far overrides cpl
author
Nadav Amit
<nadav.amit@gmail.com>
Thu, 11 Dec 2014 11:27:14 +0000
(12:27 +0100)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Thu, 11 Dec 2014 11:27:32 +0000
(12:27 +0100)
commit
d50eaa18039b
("KVM: x86: Perform limit checks when assigning EIP")
mistakenly used zero as cpl on em_ret_far. Use the actual one.
Fixes:
d50eaa18039b8b848c2285478d0775335ad5e930
Cc: stable@vger.kernel.org
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/emulate.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/kvm/emulate.c
b/arch/x86/kvm/emulate.c
index a8fcec6b706394b30d5d1474f27bf15edbc9748d..9715d6ea7d725814c857ad26b91cdd5aaa069473 100644
(file)
--- a/
arch/x86/kvm/emulate.c
+++ b/
arch/x86/kvm/emulate.c
@@
-2130,7
+2130,7
@@
static int em_ret_far(struct x86_emulate_ctxt *ctxt)
/* Outer-privilege level return is not implemented */
if (ctxt->mode >= X86EMUL_MODE_PROT16 && (cs & 3) > cpl)
return X86EMUL_UNHANDLEABLE;
- rc = __load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS,
0
, false,
+ rc = __load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS,
cpl
, false,
&new_desc);
if (rc != X86EMUL_CONTINUE)
return rc;