Module Name: src Committed By: snj Date: Tue Dec 12 09:12:53 UTC 2017
Modified Files: src/sys/arch/x86/x86 [netbsd-7-1]: fpu.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.16.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.9 src/sys/arch/x86/x86/fpu.c:1.9.16.1 --- src/sys/arch/x86/x86/fpu.c:1.9 Tue Feb 25 22:16:52 2014 +++ src/sys/arch/x86/x86/fpu.c Tue Dec 12 09:12:53 2017 @@ -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 @@ process_write_fpregs_xmm(struct lwp *lwp 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); }