Revert "kldload: Improve error handling"

It broke the test suite, and will be recommitted when fixed.
This reverts commit db887713de.

Reported by:	markj

lib/libc/gen/exterr_cat_filenames.h

@@ -12,7 +12,6 @@
 	[EXTERR_CAT_FILEDESC] = "kern/kern_descrip.c",
 	[EXTERR_CAT_PROCEXIT] = "kern/kern_exit.c",
 	[EXTERR_CAT_FORK] = "kern/kern_fork.c",
-	[EXTERR_CAT_LINKER] = "kern/kern_linker.c",
 	[EXTERR_CAT_GENIO] = "kern/sys_generic.c",
 	[EXTERR_CAT_VFSBIO] = "kern/vfs_bio.c",
 	[EXTERR_CAT_INOTIFY] = "kern/vfs_inotify.c",

sbin/kldload/kldload.c

@@ -95,9 +95,8 @@ path_check(const char *kldname, int quiet)
 
 		if (sb.st_dev != dev || sb.st_ino != ino) {
 			if (!quiet)
-				warnx(
-"%s will be loaded from %s, not the current directory",
-				    kldname, element);
+				warnx("%s will be loaded from %s, not the "
+				    "current directory", kldname, element);
 			break;
 		} else if (sb.st_dev == dev && sb.st_ino == ino)
 			break;
@@ -172,13 +171,15 @@ main(int argc, char** argv)
 					if (!quiet) {
 						switch (errno) {
 						case EEXIST:
-							warnx(
-"can't load %s: module already loaded or in kernel", argv[0]);
+							warnx("can't load %s: module "
+							    "already loaded or "
+							    "in kernel", argv[0]);
 							break;
 						case ENOEXEC:
-							warnx(
-"an error occurred while loading module %s. Please check dmesg(8) for more details.",
-							    argv[0]);
+							warnx("an error occurred while "
+							    "loading module %s. "
+							    "Please check dmesg(8) for "
+							    "more details.", argv[0]);
 							break;
 						default:
 							warn("can't load %s", argv[0]);

sys/kern/kern_linker.c

@@ -32,12 +32,10 @@
 #include "opt_hwpmc_hooks.h"
 #include "opt_hwt_hooks.h"
 
-#define EXTERR_CATEGORY EXTERR_CAT_LINKER
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/boottrace.h>
 #include <sys/eventhandler.h>
-#include <sys/exterrvar.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
@@ -457,14 +455,13 @@ linker_load_file(const char *filename, linker_file_t *result)
 
 	/* Refuse to load modules if securelevel raised */
 	if (prison0.pr_securelevel > 0)
-		return (EXTERROR(EPERM, "security level %jd",
-		    prison0.pr_securelevel));
+		return (EPERM);
 
 	sx_assert(&kld_sx, SA_XLOCKED);
 	lf = linker_find_file_by_name(filename);
 	if (lf) {
-		KLD_DPF(FILE,
-("linker_load_file: file %s is already loaded, incrementing refs\n", filename));
+		KLD_DPF(FILE, ("linker_load_file: file %s is already loaded,"
+		    " incrementing refs\n", filename));
 		*result = lf;
 		lf->refs++;
 		return (0);
@@ -511,7 +508,7 @@ linker_load_file(const char *filename, linker_file_t *result)
 			 */
 			if (modules && TAILQ_EMPTY(&lf->modules)) {
 				linker_file_unload(lf, LINKER_UNLOAD_FORCE);
-				return (EXTERROR(ENOEXEC, "no modules loaded"));
+				return (ENOEXEC);
 			}
 			linker_file_enable_sysctls(lf);
 
@@ -538,19 +535,17 @@ linker_load_file(const char *filename, linker_file_t *result)
 			    __func__, filename);
 
 		/*
-		 * Format not recognized, version incompatible, or
-		 * otherwise unloadable. When loading a module that is
-		 * statically built into the kernel EEXIST percolates
-		 * back up as the return value.  Preserve this so that
-		 * apps like sysinstall can recognize this special case
-		 * and not post bogus dialog boxes.
+		 * Format not recognized or otherwise unloadable.
+		 * When loading a module that is statically built into
+		 * the kernel EEXIST percolates back up as the return
+		 * value.  Preserve this so that apps like sysinstall
+		 * can recognize this special case and not post bogus
+		 * dialog boxes.
 		 */
 		if (error != EEXIST)
-			error = EXTERROR(ENOEXEC,
-			    "module format or version error");
+			error = ENOEXEC;
 	} else
-		error = EXTERROR(ENOENT, "kld file not found");
-		/* Nothing found */
+		error = ENOENT;		/* Nothing found */
 	return (error);
 }
 
@@ -2254,7 +2249,6 @@ linker_load_module(const char *kldname, const char *modname,
     struct linker_file *parent, const struct mod_depend *verinfo,
     struct linker_file **lfpp)
 {
-	modlist_t mod;
 	linker_file_t lfdep;
 	const char *filename;
 	char *pathname;
@@ -2265,15 +2259,16 @@ linker_load_module(const char *kldname, const char *modname,
 		/*
  		 * We have to load KLD
  		 */
-		MPASS(verinfo == NULL);
+		KASSERT(verinfo == NULL, ("linker_load_module: verinfo"
+		    " is not NULL"));
 		if (!linker_root_mounted())
-			return (EXTERROR(ENXIO, "root not yet mounted"));
+			return (ENXIO);
 		pathname = linker_search_kld(kldname);
 	} else {
 		if (modlist_lookup2(modname, verinfo) != NULL)
-			return (EXTERROR(EEXIST, "module already loaded"));
+			return (EEXIST);
 		if (!linker_root_mounted())
-			return (EXTERROR(ENXIO, "root not yet mounted"));
+			return (ENXIO);
 		if (kldname != NULL)
 			pathname = strdup(kldname, M_LINKER);
 		else
@@ -2284,7 +2279,7 @@ linker_load_module(const char *kldname, const char *modname,
 			    strlen(modname), verinfo);
 	}
 	if (pathname == NULL)
-		return (EXTERROR(ENOENT, "kld file not found"));
+		return (ENOENT);
 
 	/*
 	 * Can't load more than one file with the same basename XXX:
@@ -2293,36 +2288,16 @@ linker_load_module(const char *kldname, const char *modname,
 	 * provide different versions of the same modules.
 	 */
 	filename = linker_basename(pathname);
-	lfdep = linker_find_file_by_name(filename);
-	if (lfdep) {
-		mod = modlist_lookup(modname, 0);
-		MPASS(mod != NULL);
-
-		if (modname && verinfo &&
-		    modlist_lookup2(modname, verinfo) == NULL) {
-			/*
-			 * Desired module is already loaded, but the correct
-			 * version does not exist.
-			 */
-			error = EXTERROR(ENOEXEC,
-			    "incompatible module version %jd already loaded",
-			    mod->version);
-		} else {
-			error = EXTERROR(EEXIST,
-			    "module version %jd already loaded",
-			    mod->version);
-		}
-	} else do {
+	if (linker_find_file_by_name(filename))
+		error = EEXIST;
+	else do {
 		error = linker_load_file(pathname, &lfdep);
 		if (error)
 			break;
 		if (modname && verinfo &&
 		    modlist_lookup2(modname, verinfo) == NULL) {
-			mod = modlist_lookup(modname, 0);
-			error = EXTERROR(ENOEXEC,
-			    "incompatible module version %jd already loaded",
-			    mod->version);
 			linker_file_unload(lfdep, LINKER_UNLOAD_FORCE);
+			error = ENOENT;
 			break;
 		}
 		if (parent)
@@ -2368,11 +2343,10 @@ linker_load_dependencies(linker_file_t lf)
 		ver = ((const struct mod_version *)mp->md_data)->mv_version;
 		mod = modlist_lookup(modname, ver);
 		if (mod != NULL) {
-			printf(
-"interface %s.%d already present in the KLD '%s'!\n",
-			    modname, ver, mod->container->filename);
-			return (EXTERROR(EEXIST,
-			    "module version %jd already loaded", ver));
+			printf("interface %s.%d already present in the KLD"
+			    " '%s'!\n", modname, ver,
+			    mod->container->filename);
+			return (EEXIST);
 		}
 	}
 
@@ -2402,9 +2376,8 @@ linker_load_dependencies(linker_file_t lf)
 		}
 		error = linker_load_module(NULL, modname, lf, verinfo, NULL);
 		if (error) {
-			printf(
-"KLD %s: depends on %s - not available or version mismatch\n",
-			    lf->filename, modname);
+			printf("KLD %s: depends on %s - not available or"
+			    " version mismatch\n", lf->filename, modname);
 			break;
 		}
 	}

sys/sys/exterr_cat.h

@@ -41,7 +41,6 @@
 #define	EXTERR_CAT_PROCEXIT	16
 #define	EXTERR_CAT_VMM		17
 #define	EXTERR_CAT_HWPMC_IBS	18
-#define	EXTERR_CAT_LINKER	19
 
 #endif