Commit f84d9d8d authored Jan 08, 2015 by Nadav Amit Committed by Greg Kroah-Hartman Jan 29, 2015

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>

parent cb2567bf

arch/x86/kvm/emulate.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3777,8 +3777,8 @@ static const struct opcode group5[] = {
	};		};

	static const struct opcode group6[] = {		static const struct opcode group6[] = {
	DI(Prot, sldt),		DI(Prot \| DstMem, sldt),
	DI(Prot, str),		DI(Prot \| DstMem, str),
	II(Prot \| Priv \| SrcMem16, em_lldt, lldt),		II(Prot \| Priv \| SrcMem16, em_lldt, lldt),
	II(Prot \| Priv \| SrcMem16, em_ltr, ltr),		II(Prot \| Priv \| SrcMem16, em_ltr, ltr),
	N, N, N, N,		N, N, N, N,