Module Name: src
Committed By: martin
Date: Sat May 5 15:11:53 UTC 2018
Modified Files:
src/share/man/man9 [netbsd-8]: secmodel_securelevel.9
src/sys/arch/x86/x86 [netbsd-8]: svs.c
src/sys/secmodel/securelevel [netbsd-8]: secmodel_securelevel.c
src/sys/secmodel/suser [netbsd-8]: secmodel_suser.c
src/sys/sys [netbsd-8]: kauth.h
Log Message:
Pull up following revision(s) (requested by alnsn in ticket #790):
share/man/man9/secmodel_securelevel.9: revision 1.16
sys/secmodel/suser/secmodel_suser.c: revision 1.44
sys/secmodel/securelevel/secmodel_securelevel.c: revision 1.31
sys/sys/kauth.h: revision 1.76
sys/arch/x86/x86/svs.c: revision 1.18
Add KAUTH_MACHDEP_SVS_DISABLE and add support to secmodel_securelevel(9).
Disabling SVS is denied at securelevel 1 and above.
Add SVS. It may not be disabled at securelevel 1 and above.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.18.1 src/share/man/man9/secmodel_securelevel.9
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/sys/arch/x86/x86/svs.c
cvs rdiff -u -r1.30 -r1.30.22.1 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
cvs rdiff -u -r1.42.10.1 -r1.42.10.2 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.73.10.2 -r1.73.10.3 src/sys/sys/kauth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/secmodel_securelevel.9
diff -u src/share/man/man9/secmodel_securelevel.9:1.15 src/share/man/man9/secmodel_securelevel.9:1.15.18.1
--- src/share/man/man9/secmodel_securelevel.9:1.15 Tue Mar 18 18:20:40 2014
+++ src/share/man/man9/secmodel_securelevel.9 Sat May 5 15:11:53 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: secmodel_securelevel.9,v 1.15 2014/03/18 18:20:40 riastradh Exp $
+.\" $NetBSD: secmodel_securelevel.9,v 1.15.18.1 2018/05/05 15:11:53 martin Exp $
.\"
.\" Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
.\" Copyright (c) 2000 Hugh Graham
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd November 22, 2012
+.Dd April 26, 2018
.Dt SECMODEL_SECURELEVEL 9
.Os
.Sh NAME
@@ -136,6 +136,8 @@ Access to unmanaged memory is denied.
Only GPIO pins that have been set at
.Em securelevel
0 can be accessed.
+.It
+SVS (Separate Virtual Space) may not be disabled on platforms that support it.
.El
.It \ 2 Em Highly secure mode
.Bl -bullet
Index: src/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.14.2.3 src/sys/arch/x86/x86/svs.c:1.14.2.4
--- src/sys/arch/x86/x86/svs.c:1.14.2.3 Mon Apr 2 08:43:58 2018
+++ src/sys/arch/x86/x86/svs.c Sat May 5 15:11:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svs.c,v 1.14.2.3 2018/04/02 08:43:58 martin Exp $ */
+/* $NetBSD: svs.c,v 1.14.2.4 2018/05/05 15:11:53 martin Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14.2.3 2018/04/02 08:43:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14.2.4 2018/05/05 15:11:53 martin Exp $");
#include "opt_svs.h"
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/cpu.h>
+#include <sys/kauth.h>
#include <sys/sysctl.h>
#include <sys/xcall.h>
@@ -737,11 +738,13 @@ sysctl_machdep_svs_enabled(SYSCTLFN_ARGS
error = 0;
else
error = EOPNOTSUPP;
- } else {
- if (svs_enabled)
+ } else if (svs_enabled) {
+ error = kauth_authorize_machdep(kauth_cred_get(),
+ KAUTH_MACHDEP_SVS_DISABLE, NULL, NULL, NULL, NULL);
+ if (!error)
error = svs_disable();
- else
- error = 0;
+ } else {
+ error = 0;
}
return error;
Index: src/sys/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.30 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.30.22.1
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.30 Tue Feb 25 18:30:13 2014
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c Sat May 5 15:11:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.30 2014/02/25 18:30:13 pooka Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.30.22.1 2018/05/05 15:11:53 martin Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.30 2014/02/25 18:30:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.30.22.1 2018/05/05 15:11:53 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -494,6 +494,11 @@ secmodel_securelevel_machdep_cb(kauth_cr
result = KAUTH_RESULT_DENY;
break;
+ case KAUTH_MACHDEP_SVS_DISABLE:
+ if (securelevel > 0)
+ result = KAUTH_RESULT_DENY;
+ break;
+
case KAUTH_MACHDEP_CPU_UCODE_APPLY:
if (securelevel > 1)
result = KAUTH_RESULT_DENY;
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.42.10.1 src/sys/secmodel/suser/secmodel_suser.c:1.42.10.2
--- src/sys/secmodel/suser/secmodel_suser.c:1.42.10.1 Tue Aug 1 23:18:30 2017
+++ src/sys/secmodel/suser/secmodel_suser.c Sat May 5 15:11:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.42.10.1 2017/08/01 23:18:30 snj Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.42.10.2 2018/05/05 15:11:53 martin Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.42.10.1 2017/08/01 23:18:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.42.10.2 2018/05/05 15:11:53 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -854,6 +854,7 @@ secmodel_suser_machdep_cb(kauth_cred_t c
case KAUTH_MACHDEP_UNMANAGEDMEM:
case KAUTH_MACHDEP_PXG:
case KAUTH_MACHDEP_X86PMC:
+ case KAUTH_MACHDEP_SVS_DISABLE:
if (isroot)
result = KAUTH_RESULT_ALLOW;
break;
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.73.10.2 src/sys/sys/kauth.h:1.73.10.3
--- src/sys/sys/kauth.h:1.73.10.2 Thu Apr 12 13:42:49 2018
+++ src/sys/sys/kauth.h Sat May 5 15:11:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.73.10.2 2018/04/12 13:42:49 martin Exp $ */
+/* $NetBSD: kauth.h,v 1.73.10.3 2018/05/05 15:11:53 martin Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -320,7 +320,8 @@ enum {
KAUTH_MACHDEP_NVRAM,
KAUTH_MACHDEP_UNMANAGEDMEM,
KAUTH_MACHDEP_PXG,
- KAUTH_MACHDEP_X86PMC
+ KAUTH_MACHDEP_X86PMC,
+ KAUTH_MACHDEP_SVS_DISABLE
};
/*
