diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2004-02-18 10:14:17 +0000 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2004-02-18 10:14:17 +0000 |
commit | 21fbe0e37521500530f36fe0a35edea52e79c19a (patch) | |
tree | e9c979a534030bad06a686f9be430f029003debe | |
parent | 53302f80dae71c81377076992cf21128e6dff482 (diff) | |
download | busybox-w32-21fbe0e37521500530f36fe0a35edea52e79c19a.tar.gz busybox-w32-21fbe0e37521500530f36fe0a35edea52e79c19a.tar.bz2 busybox-w32-21fbe0e37521500530f36fe0a35edea52e79c19a.zip |
Patch from OpenWrt.
-rw-r--r-- | modutils/insmod.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 5960b591d..73259131b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -282,7 +282,7 @@ extern int insmod_ng_main( int argc, char **argv); | |||
282 | #ifndef MODUTILS_MODULE_H | 282 | #ifndef MODUTILS_MODULE_H |
283 | static const int MODUTILS_MODULE_H = 1; | 283 | static const int MODUTILS_MODULE_H = 1; |
284 | 284 | ||
285 | #ident "$Id: insmod.c,v 1.111 2004/01/05 23:49:37 andersen Exp $" | 285 | #ident "$Id: insmod.c,v 1.112 2004/02/18 10:14:17 mjn3 Exp $" |
286 | 286 | ||
287 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 287 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
288 | We do not use the kernel headers directly because we do not wish | 288 | We do not use the kernel headers directly because we do not wish |
@@ -503,7 +503,7 @@ int delete_module(const char *); | |||
503 | #ifndef MODUTILS_OBJ_H | 503 | #ifndef MODUTILS_OBJ_H |
504 | static const int MODUTILS_OBJ_H = 1; | 504 | static const int MODUTILS_OBJ_H = 1; |
505 | 505 | ||
506 | #ident "$Id: insmod.c,v 1.111 2004/01/05 23:49:37 andersen Exp $" | 506 | #ident "$Id: insmod.c,v 1.112 2004/02/18 10:14:17 mjn3 Exp $" |
507 | 507 | ||
508 | /* The relocatable object is manipulated using elfin types. */ | 508 | /* The relocatable object is manipulated using elfin types. */ |
509 | 509 | ||
@@ -3589,8 +3589,10 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits) | |||
3589 | const char *name; | 3589 | const char *name; |
3590 | if (sym->st_name) | 3590 | if (sym->st_name) |
3591 | name = strtab + sym->st_name; | 3591 | name = strtab + sym->st_name; |
3592 | else | 3592 | else if (sym->st_shndx < shnum) |
3593 | name = f->sections[sym->st_shndx]->name; | 3593 | name = f->sections[sym->st_shndx]->name; |
3594 | else | ||
3595 | continue; | ||
3594 | 3596 | ||
3595 | #if defined(__SH5__) | 3597 | #if defined(__SH5__) |
3596 | /* | 3598 | /* |