Sat Jun 27 17:27:59 2020 UTC ()

print the index of the problematic symbol


(christos)

diff -r1.66 -r1.67 src/sys/kern/subr_kobj.c

--- src/sys/kern/subr_kobj.c 2018/06/23 14:22:30	1.66
+++ src/sys/kern/subr_kobj.c 2020/06/27 17:27:59	1.67

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_kobj.c,v 1.66 2018/06/23 14:22:30 jakllsch Exp $	*/
+/*	$NetBSD: subr_kobj.c,v 1.67 2020/06/27 17:27:59 christos Exp $	*/
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -53,27 +53,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Kernel loader for ELF objects.
+ *
  * TODO: adjust kmem_alloc() calls to avoid needless fragmentation.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.66 2018/06/23 14:22:30 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.67 2020/06/27 17:27:59 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
 #endif
 #include <sys/kobj_impl.h>
 #ifdef MODULAR
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 @@ -879,65 +879,72 @@ kobj_sym_lookup(kobj_t ko, uintptr_t sym
 	const Elf_Sym *sym;
 	const char *symbol;
 	sym = ko->ko_symtab + symidx;
 	if (symidx == SHN_ABS) {
 		*val = (uintptr_t)sym->st_value;
 		return 0;
 	} else if (symidx >= ko->ko_symcnt) {
 		/*
 		 * Don't even try to lookup the symbol if the index is
 		 * bogus.
 		 */
-		kobj_error(ko, "symbol index out of range");
+		kobj_error(ko, "symbol index %ju out of range",
 		    (uintmax_t)symidx);
 		return EINVAL;
+	}
 	/* Quick answer if there is a definition included. */
 	if (sym->st_shndx != SHN_UNDEF) {
 		*val = (uintptr_t)sym->st_value;
 		return 0;
+	}
 	/* If we get here, then it is undefined and needs a lookup. */
 	switch (ELF_ST_BIND(sym->st_info)) {
 	case STB_LOCAL:
 		/* Local, but undefined? huh? */
-		kobj_error(ko, "local symbol undefined");
+		kobj_error(ko, "local symbol @%ju undefined",
 		    (uintmax_t)symidx);
 		return EINVAL;
 	case STB_GLOBAL:
 		/* Relative to Data or Function name */
 		symbol = ko->ko_strtab + sym->st_name;
 		/* Force a lookup failure if the symbol name is bogus. */
 		if (*symbol == 0) {
-			kobj_error(ko, "bad symbol name");
+			kobj_error(ko, "bad symbol @%ju name",
 			    (uintmax_t)symidx);
 			return EINVAL;
+		}
 		if (sym->st_value == 0) {
-			kobj_error(ko, "bad value");
+			kobj_error(ko, "%s @%ju: bad value", symbol,
 			    (uintmax_t)symidx);
 			return EINVAL;
+		}
 		*val = (uintptr_t)sym->st_value;
 		return 0;
 	case STB_WEAK:
-		kobj_error(ko, "weak symbols not supported");
+		kobj_error(ko, "weak symbol @%ju not supported",
 		    (uintmax_t)symidx);
 		return EINVAL;
 	default:
 		kobj_error(ko, "bad binding %#x for symbol @%ju",
 		    ELF_ST_BIND(sym->st_info), (uintmax_t)symidx);
 		return EINVAL;
+	}
+}
 /*
  * kobj_findbase:
+ *
  *	Return base address of the given section.
  */
 static uintptr_t
 kobj_findbase(kobj_t ko, int sec)
+{
 	int i;