Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f84d9d8d9b3b03b4e449b7c40f99ddacb6d189ad

Authored by Nadav Amit
Committed by Greg Kroah-Hartman
1 parent cb2567bf3e

KVM: x86: Fix of previously incomplete fix for CVE-2014-8480 

commit 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 upstream.

STR and SLDT with rip-relative operand can cause a host kernel oops.
Mark them as DstMem as well.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/x86/kvm/emulate.c
Diff comments   View file @ f84d9d8
... ... @@ -3777,8 +3777,8 @@
3777 3777 };
3778 3778  
3779 3779 static const struct opcode group6[] = {
3780   - DI(Prot, sldt),
3781   - DI(Prot, str),
  3780 + DI(Prot | DstMem, sldt),
  3781 + DI(Prot | DstMem, str),
3782 3782 II(Prot | Priv | SrcMem16, em_lldt, lldt),
3783 3783 II(Prot | Priv | SrcMem16, em_ltr, ltr),
3784 3784 N, N, N, N,