summaryrefslogtreecommitdiff
path: root/sys/secmodel
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-01-16 12:34:50 +0000
committerad <ad@NetBSD.org>2008-01-16 12:34:50 +0000
commitbbc79e58a6b48edc15ae7b2ed8364880fddce1e7 (patch)
tree6d440cbcabd2266a3a662898fa5827974c00ff74 /sys/secmodel
parent257a88e757110a1158f1cbf6be74f050d52f27d6 (diff)
Pull in my modules code for review/test/hacking.
Diffstat (limited to 'sys/secmodel')
-rw-r--r--sys/secmodel/bsd44/secmodel_bsd44_suser.c9
-rw-r--r--sys/secmodel/securelevel/secmodel_securelevel.c5
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/secmodel/bsd44/secmodel_bsd44_suser.c b/sys/secmodel/bsd44/secmodel_bsd44_suser.c
index fd30d92f3eb..f4f18738f08 100644
--- a/sys/secmodel/bsd44/secmodel_bsd44_suser.c
+++ b/sys/secmodel/bsd44/secmodel_bsd44_suser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_bsd44_suser.c,v 1.44 2008/01/07 23:51:07 elad Exp $ */
+/* $NetBSD: secmodel_bsd44_suser.c,v 1.45 2008/01/16 12:34:53 ad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_suser.c,v 1.44 2008/01/07 23:51:07 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_suser.c,v 1.45 2008/01/16 12:34:53 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -326,6 +326,11 @@ secmodel_bsd44_suser_system_cb(kauth_cred_t cred, kauth_action_t action,
result = KAUTH_RESULT_ALLOW;
break;
+ case KAUTH_SYSTEM_MODULE:
+ if (isroot)
+ result = KAUTH_RESULT_ALLOW;
+ break;
+
default:
result = KAUTH_RESULT_DEFER;
break;
diff --git a/sys/secmodel/securelevel/secmodel_securelevel.c b/sys/secmodel/securelevel/secmodel_securelevel.c
index 5cd4a9465ad..12921c6a896 100644
--- a/sys/secmodel/securelevel/secmodel_securelevel.c
+++ b/sys/secmodel/securelevel/secmodel_securelevel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.6 2008/01/14 17:56:21 ad Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.7 2008/01/16 12:34:53 ad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.6 2008/01/14 17:56:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.7 2008/01/16 12:34:53 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -201,6 +201,7 @@ secmodel_securelevel_system_cb(kauth_cred_t cred,
break;
case KAUTH_SYSTEM_LKM:
+ case KAUTH_SYSTEM_MODULE:
if (securelevel > 0)
result = KAUTH_RESULT_DENY;
break;