CVS commit: src/sys/secmodel/securelevel

[Elad Efrat]

Module Name:    src
Committed By:   elad
Date:           Wed Oct  7 01:06:57 UTC 2009

Modified Files:
        src/sys/secmodel/securelevel: secmodel_securelevel.c

Log Message:
Compare against initproc, not pid 1, to check if it's init (unify).


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
    src/sys/secmodel/securelevel/secmodel_securelevel.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/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.19 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.20
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.19	Tue Oct  6 05:03:58 2009
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c	Wed Oct  7 01:06:57 2009
@@ -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 <e...@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 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 @@
 	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;