diff options
| author | Nadav Amit <nadav.amit@gmail.com> | 2015-01-08 11:59:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-29 17:40:45 -0800 |
| commit | f84d9d8d9b3b03b4e449b7c40f99ddacb6d189ad (patch) | |
| tree | c27a55058ed016dfec37778bfe5c533478c83308 | |
| parent | cb2567bf3eed3c7fe5fd914d827e3088d21e565f (diff) | |
| download | lwn-f84d9d8d9b3b03b4e449b7c40f99ddacb6d189ad.tar.gz lwn-f84d9d8d9b3b03b4e449b7c40f99ddacb6d189ad.zip | |
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>
| -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 ac640d47c28d..c7327a7761ca 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3777,8 +3777,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, |