Message ID | 1424305990-17983-101-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
On Wed, 2015-02-18 at 16:33 -0800, Kamal Mostafa wrote: > 3.13.11-ckt16 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Nadav Amit <nadav.amit@gmail.com> > > commit 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 upstream. > > STR and SLDT with rip-relative operand can cause a host kernel oops. > Mark them as DstMem as well. Dropping this one from 3.13-stable, per Nadav's advice to other pre-3.17 stables. -Kamal > Signed-off-by: Nadav Amit <namit@cs.technion.ac.il> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > arch/x86/kvm/emulate.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c > index 4919b95..569c8ed 100644 > --- a/arch/x86/kvm/emulate.c > +++ b/arch/x86/kvm/emulate.c > @@ -3733,8 +3733,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,
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 4919b95..569c8ed 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3733,8 +3733,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,