summaryrefslogtreecommitdiff
path: root/sys/secmodel/securelevel
diff options
context:
space:
mode:
authorelad <elad@NetBSD.org>2009-10-07 01:06:57 +0000
committerelad <elad@NetBSD.org>2009-10-07 01:06:57 +0000
commit1e17e53958dbcd0b3b8b77e8a4b339cb3af55293 (patch)
tree63de9bcbe9cbd357f760e03ae3fca2cc61cf631a /sys/secmodel/securelevel
parentddecca9be684ab7305a813b43000bc631e868778 (diff)
Compare against initproc, not pid 1, to check if it's init (unify).
Diffstat (limited to 'sys/secmodel/securelevel')
-rw-r--r--sys/secmodel/securelevel/secmodel_securelevel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/secmodel/securelevel/secmodel_securelevel.c b/sys/secmodel/securelevel/secmodel_securelevel.c
index 30de300e2fe..47d38f51f4f 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.19 2009/10/06 05:03:58 elad Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.20 2009/10/07 01:06:57 elad 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.19 2009/10/06 05:03:58 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.20 2009/10/07 01:06:57 elad Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -66,8 +66,8 @@ static kauth_listener_t l_system, l_process, l_network, l_machdep, l_device,
static struct sysctllog *securelevel_sysctl_log;
/*
- * sysctl helper routine for securelevel. ensures that the value
- * only rises unless the caller has pid 1 (assumed to be init).
+ * Sysctl helper routine for securelevel. Ensures that the value only rises
+ * unless the caller is init.
*/
int
secmodel_securelevel_sysctl(SYSCTLFN_ARGS)
@@ -82,7 +82,7 @@ secmodel_securelevel_sysctl(SYSCTLFN_ARGS)
if (error || newp == NULL)
return (error);
- if (newsecurelevel < securelevel && l && l->l_proc->p_pid != 1)
+ if ((newsecurelevel < securelevel) && (l->l_proc != initproc))
return (EPERM);
securelevel = newsecurelevel;