PERFORCE change 119897 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=119897

Change 119897 by jhb at jhb_mutex on 2007/05/15 22:14:39

	Drop this local diff.  I believe Robert said that the kernel
	linker is supposed to manually check securelevel for some reason.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_linker.c#88 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_linker.c#88 (text+ko) ====

@@ -367,8 +367,8 @@
 	int foundfile, error;
 
 	/* Refuse to load modules if securelevel raised */
-	if ((error = securelevel_gt(curthread->td_ucred, 0)) != 0)
-		return (error);
+	if (securelevel > 0)
+		return (EPERM);
 
 	KLD_LOCK_ASSERT();
 	lf = linker_find_file_by_name(filename);
@@ -560,8 +560,8 @@
 	int error, i;
 
 	/* Refuse to unload modules if securelevel raised. */
-	if ((error = securelevel_gt(curthread->td_ucred, 0)) != 0)
-		return (error);
+	if (securelevel > 0)
+		return (EPERM);
 
 	KLD_LOCK_ASSERT();
 	KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs));