CVS commit: [netbsd-8] src/sys/arch/x86/x86

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Thu Dec 21 19:33:15 UTC 2017

Modified Files:
        src/sys/arch/x86/x86 [netbsd-8]: fpu.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/x86/x86/fpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.12 src/sys/arch/x86/x86/fpu.c:1.12.8.1
--- src/sys/arch/x86/x86/fpu.c:1.12	Thu Sep 29 17:01:43 2016
+++ src/sys/arch/x86/x86/fpu.c	Thu Dec 21 19:33:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.12 2016/09/29 17:01:43 maxv Exp $	*/
+/*	$NetBSD: fpu.c,v 1.12.8.1 2017/12/21 19:33:15 snj Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.12 2016/09/29 17:01:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.12.8.1 2017/12/21 19:33:15 snj Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -591,6 +591,7 @@ process_write_fpregs_xmm(struct lwp *l, 
 		memcpy(&fpu_save->sv_xmm, fpregs, 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);
 	}