From owner-p4-projects@FreeBSD.ORG  Tue May 15 22:15:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3391E16A4EE; Tue, 15 May 2007 22:15:26 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EFFAE16A4E5
	for <perforce@freebsd.org>; Tue, 15 May 2007 22:15:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E202213C469
	for <perforce@freebsd.org>; Tue, 15 May 2007 22:15:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FMFP3r020045
	for <perforce@freebsd.org>; Tue, 15 May 2007 22:15:25 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FMFPeU020029
	for perforce@freebsd.org; Tue, 15 May 2007 22:15:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 15 May 2007 22:15:25 GMT
Message-Id: <200705152215.l4FMFPeU020029@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119897 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 May 2007 22:15:26 -0000

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

Change 119897 by jhb@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));