Module Name: src
Committed By: snj
Date: Mon Sep 4 16:08:30 UTC 2017
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-1]: compat_13_machdep.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.50.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.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/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.50.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c Mon Sep 4 16:08:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.23.50.1 2017/09/04 16:08:30 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.50.1 2017/09/04 16:08:30 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
return (EINVAL);
/* take only psr ICC field */
#ifdef __arch64__
- tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+ tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
#else
tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
#endif
