Module Name: src
Committed By: alnsn
Date: Thu Apr 26 18:54:09 UTC 2018
Modified Files:
src/sys/arch/x86/x86: svs.c
src/sys/secmodel/securelevel: secmodel_securelevel.c
src/sys/secmodel/suser: secmodel_suser.c
src/sys/sys: kauth.h
Log Message:
Add KAUTH_MACHDEP_SVS_DISABLE and add support to secmodel_securelevel(9).
Disabling SVS is denied at securelevel 1 and above.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/x86/svs.c
cvs rdiff -u -r1.30 -r1.31 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
cvs rdiff -u -r1.43 -r1.44 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.75 -r1.76 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/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.17 src/sys/arch/x86/x86/svs.c:1.18
--- src/sys/arch/x86/x86/svs.c:1.17 Fri Mar 30 19:58:05 2018
+++ src/sys/arch/x86/x86/svs.c Thu Apr 26 18:54:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svs.c,v 1.17 2018/03/30 19:58:05 maxv Exp $ */
+/* $NetBSD: svs.c,v 1.18 2018/04/26 18:54:09 alnsn Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.17 2018/03/30 19:58:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.18 2018/04/26 18:54:09 alnsn Exp $");
#include "opt_svs.h"
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.17
#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.31
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.30 Tue Feb 25 18:30:13 2014
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c Thu Apr 26 18:54:09 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.31 2018/04/26 18:54:09 alnsn 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.31 2018/04/26 18:54:09 alnsn 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.43 src/sys/secmodel/suser/secmodel_suser.c:1.44
--- src/sys/secmodel/suser/secmodel_suser.c:1.43 Wed Jun 14 17:48:41 2017
+++ src/sys/secmodel/suser/secmodel_suser.c Thu Apr 26 18:54:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.43 2017/06/14 17:48:41 maxv Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.44 2018/04/26 18:54:09 alnsn 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.43 2017/06/14 17:48:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.44 2018/04/26 18:54:09 alnsn 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.75 src/sys/sys/kauth.h:1.76
--- src/sys/sys/kauth.h:1.75 Mon Aug 28 00:46:07 2017
+++ src/sys/sys/kauth.h Thu Apr 26 18:54:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.75 2017/08/28 00:46:07 kamil Exp $ */
+/* $NetBSD: kauth.h,v 1.76 2018/04/26 18:54:09 alnsn 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
};
/*
