raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks

Browse Source 
commit 3c9053a2ca upstream.

This fixes a Spectre-v1/L1TF vulnerability in x86_decode_insn().
kvm_emulate_instruction() (an ancestor of x86_decode_insn()) is an exported
symbol, so KVM should treat it conservatively from a security perspective.

Fixes: 045a282ca4 ("KVM: emulator: implement fninit, fnstsw, fnstcw")

Signed-off-by: Nick Finco <nifi@google.com>
Signed-off-by: Marios Pomonis <pomonis@google.com>
Reviewed-by: Andrew Honig <ahonig@google.com>
Cc: stable@vger.kernel.org
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marios Pomonis
2019-12-11 12:47:41 -08:00
committed by Greg Kroah-Hartman
parent 63d5ec6e4f
commit bb9a9b51e3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/emulate.c
View File

@@ -5315,10 +5315,15 @@ done_prefixes:
} }
break; break;
case Escape: case Escape:
if (ctxt->modrm > 0xbf) if (ctxt->modrm > 0xbf) {
opcode = opcode.u.esc->high[ctxt->modrm - 0xc0]; size_t size = ARRAY_SIZE(opcode.u.esc->high);
else u32 index = array_index_nospec(
ctxt->modrm - 0xc0, size);
opcode = opcode.u.esc->high[index];
} else {
opcode = opcode.u.esc->op[(ctxt->modrm >> 3) & 7]; opcode = opcode.u.esc->op[(ctxt->modrm >> 3) & 7];
}
break; break;
case InstrDual: case InstrDual:
if ((ctxt->modrm >> 6) == 3) if ((ctxt->modrm >> 6) == 3)