X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=insmod.c;h=0b12c694deba48707b4645b909c1efe0cc968698;hb=f3b2b52b589bccae28b1740c155733028f2b8fd5;hp=8267606e10ab5701d64595dcd8f91cdf703f5e90;hpb=43f3e6114c175a838161bfb547f469ecdb600c87;p=oweals%2Fbusybox.git diff --git a/insmod.c b/insmod.c index 8267606e1..0b12c694d 100644 --- a/insmod.c +++ b/insmod.c @@ -7,11 +7,12 @@ * and Ron Alder * * Modified by Bryan Rittmeyer to support SH4 - * and (theoretically) SH3. Note that there is still no true - * multiple architecture support. You just get SH3|SH4|i386, despite - * the mention of ARM and m68k--which may or may not work (but - * almost certainly do not, due to at least MATCH_MACHINE). I have - * only tested SH4 in little endian mode. + * and (theoretically) SH3. I have only tested SH4 in little endian mode. + * + * Modified by Alcove, Julien Gaulmin and + * Nicolas Ferre to support ARM7TDMI. Only + * very minor changes required to also work with StrongArm and presumably + * all ARM based systems. * * Based almost entirely on the Linux modutils-2.3.11 implementation. * Copyright 1996, 1997 Linux International. @@ -77,7 +78,7 @@ #ifndef MODUTILS_MODULE_H #define MODUTILS_MODULE_H 1 -#ident "$Id: insmod.c,v 1.26 2000/09/28 20:52:55 proski Exp $" +#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" /* 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 @@ -283,7 +284,7 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H #define MODUTILS_OBJ_H 1 -#ident "$Id: insmod.c,v 1.26 2000/09/28 20:52:55 proski Exp $" +#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" /* The relocatable object is manipulated using elfin types. */ @@ -317,12 +318,17 @@ int delete_module(const char *); #define SHT_RELM SHT_RELA #define Elf32_RelM Elf32_Rela -#else +#elif defined(__arm__) -/* presumably we can use these for anything but the SH */ +#define MATCH_MACHINE(x) (x == EM_ARM) +#define SHT_RELM SHT_REL +#define Elf32_RelM Elf32_Rel + +#elif defined(__i386__) + +/* presumably we can use these for anything but the SH and ARM*/ /* this is the previous behavior, but it does result in insmod.c being broken on anything except i386 */ - #ifndef EM_486 #define MATCH_MACHINE(x) (x == EM_386) #else @@ -332,6 +338,8 @@ int delete_module(const char *); #define SHT_RELM SHT_REL #define Elf32_RelM Elf32_Rel +#else +#error insmod.c no platform specified #endif #ifndef ElfW @@ -531,6 +539,17 @@ int flag_export = 1; and we can't support anything else right now anyway. In the future maybe they should be #if defined'd */ +/* Done ;-) */ + +#if defined(__arm__) +struct arm_plt_entry +{ + int offset; + int allocated:1; + int inited:1; /* has been set up */ +}; +#endif + struct arch_got_entry { int offset; unsigned offset_done:1; @@ -539,11 +558,17 @@ struct arch_got_entry { struct arch_file { struct obj_file root; +#if defined(__arm__) + struct obj_section *plt; +#endif struct obj_section *got; }; struct arch_symbol { struct obj_symbol root; +#if defined(__arm__) + struct arm_plt_entry pltent; +#endif struct arch_got_entry gotent; }; @@ -590,6 +615,10 @@ extern int delete_module(const char *); -- Bryan Rittmeyer */ +#ifdef BB_FEATURE_INSMOD_OLD_KERNEL +_syscall1(int, get_kernel_syms, struct old_kernel_sym *, ks) +#endif + #if defined(__i386__) || defined(__m68k__) || defined(__arm__) /* Jump through hoops to fixup error return codes */ #define __NR__create_module __NR_create_module @@ -623,7 +652,7 @@ static int findNamedModule(const char *fileName, struct stat *statbuf, if (fullName[0] == '\0') return (FALSE); else { - char *tmp = strrchr(fileName, '/'); + char *tmp = strrchr((char *) fileName, '/'); if (tmp == NULL) tmp = (char *) fileName; @@ -667,18 +696,20 @@ arch_apply_relocation(struct obj_file *f, struct obj_section *targsec, struct obj_section *symsec, struct obj_symbol *sym, -#if defined(__sh__) - Elf32_Rela * rel, Elf32_Addr v) -#else - Elf32_Rel * rel, Elf32_Addr v) -#endif + ElfW(RelM) *rel, ElfW(Addr) v) { struct arch_file *ifile = (struct arch_file *) f; struct arch_symbol *isym = (struct arch_symbol *) sym; - Elf32_Addr *loc = (Elf32_Addr *) (targsec->contents + rel->r_offset); - Elf32_Addr dot = targsec->header.sh_addr + rel->r_offset; - Elf32_Addr got = ifile->got ? ifile->got->header.sh_addr : 0; + ElfW(Addr) *loc = (ElfW(Addr) *) (targsec->contents + rel->r_offset); + ElfW(Addr) dot = targsec->header.sh_addr + rel->r_offset; + ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0; +#if defined(__arm__) + ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0; + + struct arm_plt_entry *pe; + unsigned long *ip; +#endif enum obj_reloc ret = obj_reloc_ok; @@ -689,52 +720,91 @@ arch_apply_relocation(struct obj_file *f, and in case that ever changes */ #if defined(__sh__) case R_SH_NONE: -#else +#elif defined(__arm__) + case R_ARM_NONE: +#elif defined(__i386__) case R_386_NONE: #endif break; #if defined(__sh__) case R_SH_DIR32: -#else +#elif defined(__arm__) + case R_ARM_ABS32: +#elif defined(__i386__) case R_386_32: #endif *loc += v; break; -#if defined(__sh__) +#if defined(__arm__) +#elif defined(__sh__) case R_SH_REL32: -#else + *loc += v - dot; + break; +#elif defined(__i386__) case R_386_PLT32: case R_386_PC32: -#endif *loc += v - dot; break; +#endif #if defined(__sh__) case R_SH_PLT32: *loc = v - dot; break; +#elif defined(__arm__) + case R_ARM_PC24: + case R_ARM_PLT32: + /* find the plt entry and initialize it if necessary */ + assert(isym != NULL); + pe = (struct arm_plt_entry*) &isym->pltent; + if (! pe->inited) { + ip = (unsigned long *) (ifile->plt->contents + pe->offset); + ip[0] = 0xe51ff004; /* ldr pc,[pc,#-4] */ + ip[1] = v; /* sym@ */ + pe->inited = 1; + } + + /* relative distance to target */ + v -= dot; + /* if the target is too far away.... */ + if ((int)v < -0x02000000 || (int)v >= 0x02000000) { + /* go via the plt */ + v = plt + pe->offset - dot; + } + if (v & 3) + ret = obj_reloc_dangerous; + + /* Convert to words. */ + v >>= 2; + + /* merge the offset into the instruction. */ + *loc = (*loc & ~0x00ffffff) | ((v + *loc) & 0x00ffffff); + break; +#elif defined(__i386__) #endif -#if defined(__sh__) +#if defined(__arm__) +#elif defined(__sh__) case R_SH_GLOB_DAT: case R_SH_JMP_SLOT: *loc = v; break; -#else +#elif defined(__i386__) case R_386_GLOB_DAT: case R_386_JMP_SLOT: *loc = v; break; #endif -#if defined(__sh__) +#if defined(__arm__) +#elif defined(__sh__) case R_SH_RELATIVE: *loc += f->baseaddr + rel->r_addend; break; -#else +#elif defined(__i386__) case R_386_RELATIVE: *loc += f->baseaddr; break; @@ -742,41 +812,46 @@ arch_apply_relocation(struct obj_file *f, #if defined(__sh__) case R_SH_GOTPC: - assert(got != 0); - *loc += got - dot + rel->r_addend;; - break; -#else +#elif defined(__arm__) + case R_ARM_GOTPC: +#elif defined(__i386__) case R_386_GOTPC: +#endif assert(got != 0); +#if defined(__sh__) + *loc += got - dot + rel->r_addend;; +#elif defined(__i386__) || defined(__arm__) *loc += got - dot; - break; #endif + break; #if defined(__sh__) case R_SH_GOT32: - assert(isym != NULL); - if (!isym->gotent.reloc_done) { - isym->gotent.reloc_done = 1; - *(Elf32_Addr *) (ifile->got->contents + isym->gotent.offset) = - v; - } - *loc += isym->gotent.offset + rel->r_addend; - break; -#else +#elif defined(__arm__) + case R_ARM_GOT32: +#elif defined(__i386__) case R_386_GOT32: +#endif assert(isym != NULL); + /* needs an entry in the .got: set it, once */ if (!isym->gotent.reloc_done) { isym->gotent.reloc_done = 1; - *(Elf32_Addr *) (ifile->got->contents + isym->gotent.offset) = - v; + *(ElfW(Addr) *) (ifile->got->contents + isym->gotent.offset) = v; } + /* make the reloc with_respect_to_.got */ +#if defined(__sh__) + *loc += isym->gotent.offset + rel->r_addend; +#elif defined(__i386__) || defined(__arm__) *loc += isym->gotent.offset; - break; #endif + break; + /* address relative to the got */ #if defined(__sh__) case R_SH_GOTOFF: -#else +#elif defined(__arm__) + case R_ARM_GOTOFF: +#elif defined(__i386__) case R_386_GOTOFF: #endif assert(got != 0); @@ -784,6 +859,7 @@ arch_apply_relocation(struct obj_file *f, break; default: + printf("Warning: unhandled reloc %d\n",ELF32_R_TYPE(rel->r_info)); ret = obj_reloc_unhandled; break; } @@ -794,81 +870,111 @@ arch_apply_relocation(struct obj_file *f, int arch_create_got(struct obj_file *f) { struct arch_file *ifile = (struct arch_file *) f; - int i, n, offset = 0, gotneeded = 0; - - n = ifile->root.header.e_shnum; - for (i = 0; i < n; ++i) { - struct obj_section *relsec, *symsec, *strsec; -#if defined(__sh__) - Elf32_Rela *rel, *relend; -#else - Elf32_Rel *rel, *relend; + int i, got_offset = 0, gotneeded = 0; +#if defined(__arm__) + int plt_offset = 0, pltneeded = 0; #endif - Elf32_Sym *symtab; - const char *strtab; + struct obj_section *relsec, *symsec, *strsec; + ElfW(RelM) *rel, *relend; + ElfW(Sym) *symtab, *extsym; + const char *strtab, *name; + struct arch_symbol *intsym; - relsec = ifile->root.sections[i]; - if (relsec->header.sh_type != SHT_REL) + for (i = 0; i < f->header.e_shnum; ++i) { + relsec = f->sections[i]; + if (relsec->header.sh_type != SHT_RELM) continue; - symsec = ifile->root.sections[relsec->header.sh_link]; - strsec = ifile->root.sections[symsec->header.sh_link]; - + symsec = f->sections[relsec->header.sh_link]; + strsec = f->sections[symsec->header.sh_link]; -#if defined(__sh__) - rel = (Elf32_Rela *) relsec->contents; - relend = rel + (relsec->header.sh_size / sizeof(Elf32_Rela)); -#else - rel = (Elf32_Rel *) relsec->contents; - relend = rel + (relsec->header.sh_size / sizeof(Elf32_Rel)); -#endif - symtab = (Elf32_Sym *) symsec->contents; + rel = (ElfW(RelM) *) relsec->contents; + relend = rel + (relsec->header.sh_size / sizeof(ElfW(RelM))); + symtab = (ElfW(Sym) *) symsec->contents; strtab = (const char *) strsec->contents; for (; rel < relend; ++rel) { - Elf32_Sym *extsym; - struct arch_symbol *intsym; - const char *name; + extsym = &symtab[ELF32_R_SYM(rel->r_info)]; switch (ELF32_R_TYPE(rel->r_info)) { -#if defined(__sh__) +#if defined(__arm__) + case R_ARM_GOT32: +#elif defined(__sh__) + case R_SH_GOT32: +#elif defined(__i386__) + case R_386_GOT32: +#endif + break; + +#if defined(__arm__) + case R_ARM_PC24: + case R_ARM_PLT32: + pltneeded = 1; + break; + + case R_ARM_GOTPC: + case R_ARM_GOTOFF: + gotneeded = 1; + if (got_offset == 0) + got_offset = 4; +#elif defined(__sh__) case R_SH_GOTPC: case R_SH_GOTOFF: -#else + gotneeded = 1; +#elif defined(__i386__) case R_386_GOTPC: case R_386_GOTOFF: -#endif gotneeded = 1; +#endif + default: continue; - -#if defined(__sh__) - case R_SH_GOT32: -#else - case R_386_GOT32: -#endif - break; } - extsym = &symtab[ELF32_R_SYM(rel->r_info)]; - if (extsym->st_name) + if (extsym->st_name != 0) { name = strtab + extsym->st_name; - else + } else { name = f->sections[extsym->st_shndx]->name; - intsym = - (struct arch_symbol *) obj_find_symbol(&ifile->root, name); + } + intsym = (struct arch_symbol *) obj_find_symbol(f, name); if (!intsym->gotent.offset_done) { intsym->gotent.offset_done = 1; - intsym->gotent.offset = offset; - offset += 4; + intsym->gotent.offset = got_offset; + got_offset += 4; } +#if defined(__arm__) + if (pltneeded && intsym->pltent.allocated == 0) { + intsym->pltent.allocated = 1; + intsym->pltent.offset = plt_offset; + plt_offset += 8; + intsym->pltent.inited = 0; + pltneeded = 0; + } +#endif + } + } + +#if defined(__arm__) + if (got_offset) { + struct obj_section* relsec = obj_find_section(f, ".got"); + + if (relsec) { + obj_extend_section(relsec, got_offset); + } else { + relsec = obj_create_alloced_section(f, ".got", 8, got_offset); + assert(relsec); } + + ifile->got = relsec; } - if (offset > 0 || gotneeded) - ifile->got = - obj_create_alloced_section(&ifile->root, ".got", 4, offset); + if (plt_offset) + ifile->plt = obj_create_alloced_section(f, ".plt", 8, plt_offset); +#else + if (got_offset > 0 || gotneeded) + ifile->got = obj_create_alloced_section(f, ".got", 4, got_offset); +#endif return 1; } @@ -1051,7 +1157,7 @@ struct obj_symbol *obj_add_symbol(struct obj_file *f, const char *name, /* Don't report an error if the symbol is coming from the kernel or some external module. */ if (secidx <= SHN_HIRESERVE) - errorMsg("%s multiply defined\n", name); + error_msg("%s multiply defined\n", name); return sym; } } @@ -1314,7 +1420,7 @@ old_process_module_arguments(struct obj_file *f, int argc, char **argv) /* Also check that the parameter was not resolved from the kernel. */ if (sym == NULL || sym->secidx > SHN_HIRESERVE) { - errorMsg("symbol for parameter %s not found\n", p); + error_msg("symbol for parameter %s not found\n", p); return 0; } @@ -1327,7 +1433,7 @@ old_process_module_arguments(struct obj_file *f, int argc, char **argv) str = alloca(strlen(q)); for (r = str, q++; *q != '"'; ++q, ++r) { if (*q == '\0') { - errorMsg("improperly terminated string argument for %s\n", p); + error_msg("improperly terminated string argument for %s\n", p); return 0; } else if (*q == '\\') switch (*++q) { @@ -1456,7 +1562,7 @@ static int old_get_kernel_symbols(const char *m_name) nks = get_kernel_syms(NULL); if (nks < 0) { - errorMsg("get_kernel_syms: %s: %s", m_name, strerror(errno)); + error_msg("get_kernel_syms: %s: %s\n", m_name, strerror(errno)); return 0; } @@ -1598,7 +1704,7 @@ old_init_module(const char *m_name, struct obj_file *f, ksym->name = (unsigned long) str - (unsigned long) symtab; - str = stpcpy(str, sym->name) + 1; + str = strcpy(str, sym->name) + 1; ksym++; } } @@ -1637,7 +1743,7 @@ old_init_module(const char *m_name, struct obj_file *f, m_size | (flag_autoclean ? OLD_MOD_AUTOCLEAN : 0), &routines, symtab); if (ret) - errorMsg("init_module: %s: %s", m_name, strerror(errno)); + error_msg("init_module: %s: %s\n", m_name, strerror(errno)); free(image); free(symtab); @@ -1680,7 +1786,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) p = get_modinfo_value(f, key); key += 5; if (p == NULL) { - errorMsg("invalid parameter %s\n", key); + error_msg("invalid parameter %s\n", key); return 0; } @@ -1688,7 +1794,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) /* Also check that the parameter was not resolved from the kernel. */ if (sym == NULL || sym->secidx > SHN_HIRESERVE) { - errorMsg("symbol for parameter %s not found\n", key); + error_msg("symbol for parameter %s not found\n", key); return 0; } @@ -1716,7 +1822,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) str = alloca(strlen(q)); for (r = str, q++; *q != '"'; ++q, ++r) { if (*q == '\0') { - errorMsg("improperly terminated string argument for %s\n", + error_msg("improperly terminated string argument for %s\n", key); return 0; } else if (*q == '\\') @@ -1810,7 +1916,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) /* Get the size of each member */ /* Probably we should do that outside the loop ? */ if (!isdigit(*(p + 1))) { - errorMsg("parameter type 'c' for %s must be followed by" + error_msg("parameter type 'c' for %s must be followed by" " the maximum size\n", key); return 0; } @@ -1818,7 +1924,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) /* Check length */ if (strlen(str) >= charssize) { - errorMsg("string too long for %s (max %ld)\n", key, + error_msg("string too long for %s (max %ld)\n", key, charssize - 1); return 0; } @@ -1847,7 +1953,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) break; default: - errorMsg("unknown parameter type '%c' for %s\n", *p, key); + error_msg("unknown parameter type '%c' for %s\n", *p, key); return 0; } } @@ -1866,21 +1972,21 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) case ',': if (++n > max) { - errorMsg("too many values for %s (max %d)\n", key, max); + error_msg("too many values for %s (max %d)\n", key, max); return 0; } ++q; break; default: - errorMsg("invalid argument syntax for %s\n", key); + error_msg("invalid argument syntax for %s\n", key); return 0; } } end_of_arg: if (n < min) { - errorMsg("too few values for %s (min %d)\n", key, min); + error_msg("too few values for %s (min %d)\n", key, min); return 0; } @@ -1949,7 +2055,7 @@ static int new_get_kernel_symbols(void) module_names = xrealloc(module_names, bufsize = ret); goto retry_modules_load; } - errorMsg("QM_MODULES: %s", strerror(errno)); + error_msg("QM_MODULES: %s\n", strerror(errno)); return 0; } @@ -1968,7 +2074,7 @@ static int new_get_kernel_symbols(void) /* The module was removed out from underneath us. */ continue; } - errorMsg("query_module: QM_INFO: %s: %s", mn, strerror(errno)); + error_msg("query_module: QM_INFO: %s: %s\n", mn, strerror(errno)); return 0; } @@ -1983,7 +2089,7 @@ static int new_get_kernel_symbols(void) /* The module was removed out from underneath us. */ continue; default: - errorMsg("query_module: QM_SYMBOLS: %s: %s", mn, strerror(errno)); + error_msg("query_module: QM_SYMBOLS: %s: %s\n", mn, strerror(errno)); return 0; } } @@ -2008,7 +2114,7 @@ static int new_get_kernel_symbols(void) syms = xrealloc(syms, bufsize = ret); goto retry_kern_sym_load; } - errorMsg("kernel: QM_SYMBOLS: %s", strerror(errno)); + error_msg("kernel: QM_SYMBOLS: %s\n", strerror(errno)); return 0; } nksyms = nsyms = ret; @@ -2189,7 +2295,7 @@ new_init_module(const char *m_name, struct obj_file *f, ret = new_sys_init_module(m_name, (struct new_module *) image); if (ret) - errorMsg("init_module: %s: %s", m_name, strerror(errno)); + error_msg("init_module: %s: %s\n", m_name, strerror(errno)); free(image); @@ -2201,8 +2307,9 @@ new_init_module(const char *m_name, struct obj_file *f, #define new_init_module(x, y, z) TRUE #define new_create_this_module(x, y) 0 #define new_create_module_ksymtab(x) +#define query_module(v, w, x, y, z) -1 -#endif /* BB_FEATURE_INSMOD_OLD_KERNEL */ +#endif /* BB_FEATURE_INSMOD_NEW_KERNEL */ /*======================================================================*/ @@ -2265,7 +2372,7 @@ int obj_check_undefineds(struct obj_file *f) sym->secidx = SHN_ABS; sym->value = 0; } else { - errorMsg("unresolved symbol %s\n", sym->name); + error_msg("unresolved symbol %s\n", sym->name); ret = 0; } } @@ -2372,8 +2479,12 @@ void obj_allocate_commons(struct obj_file *f) for (i = 0; i < f->header.e_shnum; ++i) { struct obj_section *s = f->sections[i]; if (s->header.sh_type == SHT_NOBITS) { + if (s->header.sh_size != 0) s->contents = memset(xmalloc(s->header.sh_size), 0, s->header.sh_size); + else + s->contents = NULL; + s->header.sh_type = SHT_PROGBITS; } } @@ -2488,11 +2599,11 @@ int obj_relocate(struct obj_file *f, ElfW(Addr) base) errmsg = "Unhandled relocation"; bad_reloc: if (extsym) { - errorMsg("%s of type %ld for %s\n", errmsg, + error_msg("%s of type %ld for %s\n", errmsg, (long) ELFW(R_TYPE) (rel->r_info), strtab + extsym->st_name); } else { - errorMsg("%s of type %ld\n", errmsg, + error_msg("%s of type %ld\n", errmsg, (long) ELFW(R_TYPE) (rel->r_info)); } ret = 0; @@ -2569,7 +2680,7 @@ struct obj_file *obj_load(FILE * fp) fseek(fp, 0, SEEK_SET); if (fread(&f->header, sizeof(f->header), 1, fp) != 1) { - errorMsg("error reading ELF header: %s", strerror(errno)); + error_msg("error reading ELF header: %s\n", strerror(errno)); return NULL; } @@ -2577,25 +2688,25 @@ struct obj_file *obj_load(FILE * fp) || f->header.e_ident[EI_MAG1] != ELFMAG1 || f->header.e_ident[EI_MAG2] != ELFMAG2 || f->header.e_ident[EI_MAG3] != ELFMAG3) { - errorMsg("not an ELF file\n"); + error_msg("not an ELF file\n"); return NULL; } if (f->header.e_ident[EI_CLASS] != ELFCLASSM || f->header.e_ident[EI_DATA] != ELFDATAM || f->header.e_ident[EI_VERSION] != EV_CURRENT || !MATCH_MACHINE(f->header.e_machine)) { - errorMsg("ELF file not for this architecture\n"); + error_msg("ELF file not for this architecture\n"); return NULL; } if (f->header.e_type != ET_REL) { - errorMsg("ELF file not a relocatable object\n"); + error_msg("ELF file not a relocatable object\n"); return NULL; } /* Read the section headers. */ if (f->header.e_shentsize != sizeof(ElfW(Shdr))) { - errorMsg("section header size mismatch: %lu != %lu\n", + error_msg("section header size mismatch: %lu != %lu\n", (unsigned long) f->header.e_shentsize, (unsigned long) sizeof(ElfW(Shdr))); return NULL; @@ -2608,7 +2719,7 @@ struct obj_file *obj_load(FILE * fp) section_headers = alloca(sizeof(ElfW(Shdr)) * shnum); fseek(fp, f->header.e_shoff, SEEK_SET); if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum) { - errorMsg("error reading ELF section headers: %s", strerror(errno)); + error_msg("error reading ELF section headers: %s\n", strerror(errno)); return NULL; } @@ -2638,7 +2749,7 @@ struct obj_file *obj_load(FILE * fp) sec->contents = xmalloc(sec->header.sh_size); fseek(fp, sec->header.sh_offset, SEEK_SET); if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { - errorMsg("error reading ELF section data: %s", strerror(errno)); + error_msg("error reading ELF section data: %s\n", strerror(errno)); return NULL; } } else { @@ -2648,11 +2759,11 @@ struct obj_file *obj_load(FILE * fp) #if SHT_RELM == SHT_REL case SHT_RELA: - errorMsg("RELA relocations not supported on this architecture\n"); + error_msg("RELA relocations not supported on this architecture\n"); return NULL; #else case SHT_REL: - errorMsg("REL relocations not supported on this architecture\n"); + error_msg("REL relocations not supported on this architecture\n"); return NULL; #endif @@ -2665,7 +2776,7 @@ struct obj_file *obj_load(FILE * fp) break; } - errorMsg("can't handle sections of type %ld\n", + error_msg("can't handle sections of type %ld\n", (long) sec->header.sh_type); return NULL; } @@ -2694,7 +2805,7 @@ struct obj_file *obj_load(FILE * fp) ElfW(Sym) * sym; if (sec->header.sh_entsize != sizeof(ElfW(Sym))) { - errorMsg("symbol size mismatch: %lu != %lu\n", + error_msg("symbol size mismatch: %lu != %lu\n", (unsigned long) sec->header.sh_entsize, (unsigned long) sizeof(ElfW(Sym))); return NULL; @@ -2726,7 +2837,7 @@ struct obj_file *obj_load(FILE * fp) case SHT_RELM: if (sec->header.sh_entsize != sizeof(ElfW(RelM))) { - errorMsg("relocation entry size mismatch: %lu != %lu\n", + error_msg("relocation entry size mismatch: %lu != %lu\n", (unsigned long) sec->header.sh_entsize, (unsigned long) sizeof(ElfW(RelM))); return NULL; @@ -2769,7 +2880,7 @@ extern int insmod_main( int argc, char **argv) FILE *fp; struct obj_file *f; char m_name[BUFSIZ + 1] = "\0"; - int exit_status = FALSE; + int exit_status = EXIT_FAILURE; int m_has_modinfo; #ifdef BB_FEATURE_INSMOD_VERSION_CHECKING int k_version; @@ -2826,24 +2937,24 @@ extern int insmod_main( int argc, char **argv) /* Get a filedesc for the module */ if ((fp = fopen(*argv, "r")) == NULL) { /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ - if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, + if (recursive_action(_PATH_MODULES, TRUE, FALSE, FALSE, findNamedModule, 0, m_fullName) == FALSE) { if (m_filename[0] == '\0' || ((fp = fopen(m_filename, "r")) == NULL)) { - errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); - exit(FALSE); + error_msg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); + return EXIT_FAILURE; } } else - fatalError("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); + error_msg_and_die("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); } else memcpy(m_filename, *argv, strlen(*argv)); if ((f = obj_load(fp)) == NULL) { perror("Could not load the module\n"); - exit(FALSE); + return EXIT_FAILURE; } if (get_modinfo_value(f, "kernel_version") == NULL) @@ -2860,7 +2971,7 @@ extern int insmod_main( int argc, char **argv) } else { m_version = old_get_module_version(f, m_strversion); if (m_version == -1) { - errorMsg("couldn't find the kernel version the module was " + error_msg("couldn't find the kernel version the module was " "compiled for\n"); goto out; } @@ -2868,12 +2979,12 @@ extern int insmod_main( int argc, char **argv) if (strncmp(k_strversion, m_strversion, STRVERSIONLEN) != 0) { if (flag_force_load) { - errorMsg("Warning: kernel-module version mismatch\n" + error_msg("Warning: kernel-module version mismatch\n" "\t%s was compiled for kernel version %s\n" "\twhile this kernel is version %s\n", m_filename, m_strversion, k_strversion); } else { - errorMsg("kernel-module version mismatch\n" + error_msg("kernel-module version mismatch\n" "\t%s was compiled for kernel version %s\n" "\twhile this kernel is version %s.\n", m_filename, m_strversion, k_strversion); @@ -2891,7 +3002,7 @@ extern int insmod_main( int argc, char **argv) goto out; k_crcs = new_is_kernel_checksummed(); #else - errorMsg("Not configured to support new kernels\n"); + error_msg("Not configured to support new kernels\n"); goto out; #endif } else { @@ -2900,7 +3011,7 @@ extern int insmod_main( int argc, char **argv) goto out; k_crcs = old_is_kernel_checksummed(); #else - errorMsg("Not configured to support old kernels\n"); + error_msg("Not configured to support old kernels\n"); goto out; #endif } @@ -2957,14 +3068,14 @@ extern int insmod_main( int argc, char **argv) case 0: break; case EEXIST: - errorMsg("A module named %s already exists\n", m_name); + error_msg("A module named %s already exists\n", m_name); goto out; case ENOMEM: - errorMsg("Can't allocate kernel memory for module; needed %lu bytes\n", + error_msg("Can't allocate kernel memory for module; needed %lu bytes\n", m_size); goto out; default: - errorMsg("create_module: %s: %s", m_name, strerror(errno)); + error_msg("create_module: %s: %s\n", m_name, strerror(errno)); goto out; } @@ -2981,7 +3092,7 @@ extern int insmod_main( int argc, char **argv) goto out; } - exit_status = TRUE; + exit_status = EXIT_SUCCESS; out: fclose(fp);