diff options
| author | Nadav Amit <nadav.amit@gmail.com> | 2015-01-08 11:59:03 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-23 13:56:56 +0100 |
| commit | 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 (patch) | |
| tree | ae3f08e47d20f4f1dccf8433ca23280c98d828c4 /arch | |
| parent | cdef511985374dd042a40bb32c1c346c2662c9dc (diff) | |
| download | linux-63ea0a49ae0b145b91ff2b070c01b66fc75854b9.tar.bz2 | |
KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
STR and SLDT with rip-relative operand can cause a host kernel oops.
Mark them as DstMem as well.
Cc: stable@vger.linux.org
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 169b09d76ddd..817c6ca2c4fb 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3791,8 +3791,8 @@ static const struct opcode group5[] = { }; static const struct opcode group6[] = { - DI(Prot, sldt), - DI(Prot, str), + DI(Prot | DstMem, sldt), + DI(Prot | DstMem, str), II(Prot | Priv | SrcMem16, em_lldt, lldt), II(Prot | Priv | SrcMem16, em_ltr, ltr), N, N, N, N, |