projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cdef511)
KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
authorNadav Amit <nadav.amit@gmail.com>
Thu, 8 Jan 2015 10:59:03 +0000 (11:59 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 23 Jan 2015 12:56:56 +0000 (13:56 +0100)
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>
arch/x86/kvm/emulate.c patch | blob | blame | history

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 169b09d76ddd83d3033d93d2b7eace6fada2331e..817c6ca2c4fbf0353db31c5adfea80338a4f7c55 100644 (file)
--- 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,