Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove this (symtabindex == -1) check; it is already handled by (nsym != 1).

Browse Source 
Put a KASSERT instead.
This commit is contained in:
maxv 2014-07-06 15:35:32 +00:00
parent 3021bdd8e1
commit 8d909506c6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/subr_kobj.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $ */
/* $NetBSD: subr_kobj.c,v 1.48 2014/07/06 15:35:32 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.48 2014/07/06 15:35:32 maxv Exp $");
#include "opt_modular.h"
@ -244,8 +244,7 @@ kobj_load(kobj_t ko)
* Scan the section header for information and table sizing.
*/
nsym = 0;
symtabindex = -1;
symstrindex = -1;
symtabindex = symstrindex = -1;
for (i = 0; i < hdr->e_shnum; i++) {
switch (shdr[i].sh_type) {
case SHT_PROGBITS:
@ -282,6 +281,7 @@ kobj_load(kobj_t ko)
error = ENOEXEC;
goto out;
}
KASSERT(symtabindex != -1);
if (symstrindex < 0 || symstrindex > hdr->e_shnum ||
shdr[symstrindex].sh_type != SHT_STRTAB) {
kobj_error(ko, "file has invalid symbol strings");
@ -319,10 +319,6 @@ kobj_load(kobj_t ko)
goto out;
}
}
if (symtabindex == -1) {
kobj_error(ko, "lost symbol table index");
goto out;
}
/*
* Allocate space for and load the symbol table.