[src/netbsd-7-1]: src/sys/arch/x86/x86 Pull up following revision(s) (request...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60407b164fd6
branches:  netbsd-7-1
changeset: 800822:60407b164fd6
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Dec 12 09:12:53 2017 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1540):
        sys/arch/x86/x86/fpu.c: 1.19 via patch
Mask mxcsr, otherwise userland could set reserved bits to 1 and make
xrstor fault.

diffstat:

 sys/arch/x86/x86/fpu.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 0537fb0f83da -r 60407b164fd6 sys/arch/x86/x86/fpu.c
--- a/sys/arch/x86/x86/fpu.c    Sat Dec 02 10:53:44 2017 +0000
+++ b/sys/arch/x86/x86/fpu.c    Tue Dec 12 09:12:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $      */
+/*     $NetBSD: fpu.c,v 1.9.16.1 2017/12/12 09:12:53 snj Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.9.16.1 2017/12/12 09:12:53 snj Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -617,6 +617,7 @@
                    sizeof fpu_save->sv_xmm);
                /* Invalid bits in the mxcsr_mask will cause faults */
                fpu_save->sv_xmm.fx_mxcsr_mask &= __INITIAL_MXCSR_MASK__;
+               fpu_save->sv_xmm.fx_mxcsr &= fpu_save->sv_xmm.fx_mxcsr_mask;
        } else {
                process_xmm_to_s87(fpregs, &fpu_save->sv_87);
        }