[Midnightbsd-cvs] src [7920] trunk/sys/boot/common: Don't return an error if a kld does not contain any modules (e.g.

[laffer1 at midnightbsd.org]

Revision: 7920
          http://svnweb.midnightbsd.org/src/?rev=7920
Author:   laffer1
Date:     2016-09-14 16:04:33 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
Don't return an error if a kld does not contain any modules (e.g. a
kld that only contained a sysctl).  The kernel linker allows such
modules, so the boot loader should not reject them.

Modified Paths:
--------------
    trunk/sys/boot/common/load_elf.c
    trunk/sys/boot/common/load_elf_obj.c

Modified: trunk/sys/boot/common/load_elf.c
===================================================================
--- trunk/sys/boot/common/load_elf.c	2016-09-14 20:01:06 UTC (rev 7919)
+++ trunk/sys/boot/common/load_elf.c	2016-09-14 20:04:33 UTC (rev 7920)
@@ -612,7 +612,7 @@
     Elf_Addr v, p, p_stop;
 
     if (__elfN(lookup_symbol)(fp, ef, "__start_set_modmetadata_set", &sym) != 0)
-	return ENOENT;
+	return 0;
     p = sym.st_value + ef->off;
     if (__elfN(lookup_symbol)(fp, ef, "__stop_set_modmetadata_set", &sym) != 0)
 	return ENOENT;

Modified: trunk/sys/boot/common/load_elf_obj.c
===================================================================
--- trunk/sys/boot/common/load_elf_obj.c	2016-09-14 20:01:06 UTC (rev 7919)
+++ trunk/sys/boot/common/load_elf_obj.c	2016-09-14 20:04:33 UTC (rev 7920)
@@ -369,7 +369,7 @@
 
 	if (__elfN(obj_lookup_set)(fp, ef, "modmetadata_set", &p, &p_stop,
 	    &modcnt) != 0)
-		return ENOENT;
+		return 0;
 
 	modcnt = 0;
 	while (p < p_stop) {