From owner-p4-projects@FreeBSD.ORG  Thu Sep 18 07:03:30 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FDAD16A4C0; Thu, 18 Sep 2003 07:03:30 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2CFA216A4B3
	for <perforce@freebsd.org>; Thu, 18 Sep 2003 07:03:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A6B6143F85
	for <perforce@freebsd.org>; Thu, 18 Sep 2003 07:03:29 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8IE3TXJ044848
	for <perforce@freebsd.org>; Thu, 18 Sep 2003 07:03:29 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8IE3SA8044845
	for perforce@freebsd.org; Thu, 18 Sep 2003 07:03:28 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Date: Thu, 18 Sep 2003 07:03:28 -0700 (PDT)
Message-Id: <200309181403.h8IE3SA8044845@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38227 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 18 Sep 2003 14:03:30 -0000

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

Change 38227 by areisse@areisse_tislabs on 2003/09/18 07:02:42

	linker_preload no longer crashes when modules fail to load

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_linker.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_linker.c#5 (text+ko) ====

@@ -478,11 +478,6 @@
 	/* Refuse to unload modules if securelevel raised. */
 	if (securelevel > 0)
 		return (EPERM);
-#ifdef MAC
-	error = mac_check_kld_unload(curthread->td_ucred);
-	if (error)
-		return (error);
-#endif
 
 	KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs));
 	if (file->refs == 1) {
@@ -801,6 +796,12 @@
 	if ((error = cap_check (td, CAP_SYS_MODULE)) != 0)
 		goto out;
 
+#ifdef MAC
+	error = mac_check_kld_unload(curthread->td_ucred);
+	if (error)
+		goto out;
+#endif
+
 	lf = linker_find_file_by_id(uap->fileid);
 	if (lf) {
 		KLD_DPF(FILE, ("kldunload: lf->userrefs=%d\n", lf->userrefs));
@@ -1281,6 +1282,7 @@
 	 * We made it. Finish off the linking in the order we determined.
 	 */
 	TAILQ_FOREACH(lf, &depended_files, loaded) {
+reloop:
 		if (linker_kernel_file) {
 			linker_kernel_file->refs++;
 			error = linker_file_add_dependency(lf,
@@ -1314,8 +1316,10 @@
 		if (error) {
 			printf("KLD file %s - could not finalize loading\n",
 			    lf->filename);
+			linker_file_t next = TAILQ_NEXT (lf, loaded);
 			linker_file_unload(lf);
-			continue;
+			lf = next;
+			goto reloop;
 		}
 		linker_file_register_modules(lf);
 		if (linker_file_lookup_set(lf, "sysinit_set", &si_start,