29 lines
898 B
Diff
29 lines
898 B
Diff
From: Nadav Amit <nadav.amit@gmail.com>
|
|
Date: Thu, 8 Jan 2015 11:59:03 +0100
|
|
Subject: KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
|
|
Origin: https://git.kernel.org/linus/63ea0a49ae0b145b91ff2b070c01b66fc75854b9
|
|
|
|
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 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/x86/kvm/emulate.c
|
|
+++ b/arch/x86/kvm/emulate.c
|
|
@@ -3737,8 +3737,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,
|