From owner-freebsd-bugs@FreeBSD.ORG  Wed Apr 30 04:50:17 2003
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AF2F637B401
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 30 Apr 2003 04:50:17 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5568943FBD
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 30 Apr 2003 04:50:17 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3UBoHUp026019
	for <freebsd-bugs@freefall.freebsd.org>;
	Wed, 30 Apr 2003 04:50:17 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3UBoH7T026013;
	Wed, 30 Apr 2003 04:50:17 -0700 (PDT)
Date: Wed, 30 Apr 2003 04:50:17 -0700 (PDT)
Message-Id: <200304301150.h3UBoH7T026013@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Dmitry Sivachenko <demon@FreeBSD.org>
Subject: Re: kern/48759: kldstat shows module after unsuccessfull kldload
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Dmitry Sivachenko <demon@FreeBSD.org>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Apr 2003 11:50:18 -0000

The following reply was made to PR kern/48759; it has been noted by GNATS.

From: Dmitry Sivachenko <demon@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc: pawmal@unia.3lo.lublin.pl
Subject: Re: kern/48759: kldstat shows module after unsuccessfull kldload
Date: Wed, 30 Apr 2003 15:46:52 +0400

 Here is possible fix:
 
 For -stable:
 
 --- /sys/kern/kern_linker.c	Wed Nov 21 20:50:35 2001
 +++ kern_linker.c	Wed Apr 30 14:31:25 2003
 @@ -286,6 +286,14 @@ linker_load_file(const char* filename, l
  	if (lf) {
  	    linker_file_register_sysctls(lf);
  	    error = linker_file_sysinit(lf);
 +	    if (error) {
 +		/*
 +		 * Unset LINKER_FILE_LINKED flag so SYSUNINITs are not
 +		 * executed because of error in linker_file_sysinit() above.
 +		 */
 +		lf->flags &= ~LINKER_FILE_LINKED;
 +		(void)linker_file_unload(lf);
 +	    }
  
  	    *result = lf;
  	    goto out;
 
 for -current:
 
 --- kern_linker.c.orig	Wed Apr 30 14:53:49 2003
 +++ kern_linker.c	Wed Apr 30 15:36:52 2003
 @@ -297,9 +297,11 @@ linker_file_register_modules(linker_file
  		KLD_DPF(FILE, ("Registering module %s in %s\n",
  		    moddata->name, lf->filename));
  		error = module_register(moddata, lf);
 -		if (error)
 +		if (error) {
  			printf("Module %s failed to register: %d\n",
  			    moddata->name, error);
 +			return (error);
 +		}
  	}
  	return (0);
  }
 @@ -351,7 +353,11 @@ linker_load_file(const char *filename, l
  		if (error != ENOENT)
  			foundfile = 1;
  		if (lf) {
 -			linker_file_register_modules(lf);
 +			error = linker_file_register_modules(lf);
 +			if (error == EEXIST) {
 +				(void)linker_file_unload(lf);
 +				goto out;
 +			}
  			linker_file_register_sysctls(lf);
  			linker_file_sysinit(lf);
  			lf->flags |= LINKER_FILE_LINKED;