emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a nasty hard to spot bug found by Ralph Siemsen <ralphs@netwinder.org>.

Browse Source 
This would cause it to obliterates the end of the strtab section, so
symbol lookups would fail and then it would crash.  Ugh.  This should
fix things for people having trouble with insmod.
This commit is contained in:
Eric Andersen 2001-06-28 21:36:06 +00:00
parent 029b4a0422
commit 66ca9480c8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
insmod.c
View File

@ -130,7 +130,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1; static const int MODUTILS_MODULE_H = 1;
#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $" #ident "$Id: insmod.c,v 1.67 2001/06/28 21:36:06 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish We do not use the kernel headers directly because we do not wish
@ -347,7 +347,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1; static const int MODUTILS_OBJ_H = 1;
#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $" #ident "$Id: insmod.c,v 1.67 2001/06/28 21:36:06 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -1460,8 +1460,13 @@ struct obj_symbol *obj_add_symbol(struct obj_file *f, const char *name,
f->symtab[hash] = sym; f->symtab[hash] = sym;
sym->ksymidx = -1; sym->ksymidx = -1;
if (ELFW(ST_BIND) (info) == STB_LOCAL) if (ELFW(ST_BIND)(info) == STB_LOCAL && symidx != -1) {
f->local_symtab[symidx] = sym; if (symidx >= f->local_symtab_size)
error_msg("local symbol %s with index %ld exceeds local_symtab_size %ld",
name, (long) symidx, (long) f->local_symtab_size);
else
f->local_symtab[symidx] = sym;
}
found: found:
sym->name = name; sym->name = name;

13
modutils/insmod.c
View File

@ -130,7 +130,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1; static const int MODUTILS_MODULE_H = 1;
#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $" #ident "$Id: insmod.c,v 1.67 2001/06/28 21:36:06 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish We do not use the kernel headers directly because we do not wish
@ -347,7 +347,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1; static const int MODUTILS_OBJ_H = 1;
#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $" #ident "$Id: insmod.c,v 1.67 2001/06/28 21:36:06 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -1460,8 +1460,13 @@ struct obj_symbol *obj_add_symbol(struct obj_file *f, const char *name,
f->symtab[hash] = sym; f->symtab[hash] = sym;
sym->ksymidx = -1; sym->ksymidx = -1;
if (ELFW(ST_BIND) (info) == STB_LOCAL) if (ELFW(ST_BIND)(info) == STB_LOCAL && symidx != -1) {
f->local_symtab[symidx] = sym; if (symidx >= f->local_symtab_size)
error_msg("local symbol %s with index %ld exceeds local_symtab_size %ld",
name, (long) symidx, (long) f->local_symtab_size);
else
f->local_symtab[symidx] = sym;
}
found: found:
sym->name = name; sym->name = name;