X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=insmod.c;h=0a7cb1e4ab3156fd43d177fbca75a3b176e9e173;hb=3a6da8c183142a2681a2382b63e970f457cf807b;hp=4e159be5d0c760167ec36247baf113b0423d628f;hpb=089d12d762ddaa9d4be2df1e1ffc21bdfc34902a;p=oweals%2Fbusybox.git diff --git a/insmod.c b/insmod.c index 4e159be5d..0a7cb1e4a 100644 --- a/insmod.c +++ b/insmod.c @@ -2,10 +2,30 @@ /* * Mini insmod implementation for busybox * - * Copyright (C) 1999,2000 by Lineo, inc. + * Copyright (C) 1999,2000,2001 by Lineo, inc. * Written by Erik Andersen * and Ron Alder * + * Modified by Bryan Rittmeyer to support SH4 + * 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. + * + * Magnus Damm added PowerPC support 20-Feb-2001. + * PowerPC specific code stolen from modutils-2.3.16, + * written by Paul Mackerras, Copyright 1996, 1997 Linux International. + * I've only tested the code on mpc8xx platforms in big-endian mode. + * Did some cleanup and added BB_USE_xxx_ENTRIES... + * + * Quinn Jensen added MIPS support 23-Feb-2001. + * based on modutils-2.4.2 + * MIPS specific support for Elf loading and relocation. + * Copyright 1996, 1997 Linux International. + * Contributed by Ralf Baechle + * * Based almost entirely on the Linux modutils-2.3.11 implementation. * Copyright 1996, 1997 Linux International. * New implementation contributed by Richard Henderson @@ -29,7 +49,6 @@ * */ -#include "internal.h" #include #include #include @@ -38,8 +57,38 @@ #include #include #include +#include #include #include +#include +#include +#include "busybox.h" + +#if defined(__powerpc__) +#define BB_USE_PLT_ENTRIES +#define BB_PLT_ENTRY_SIZE 16 +#endif + +#if defined(__arm__) +#define BB_USE_PLT_ENTRIES +#define BB_PLT_ENTRY_SIZE 8 +#define BB_USE_GOT_ENTRIES +#define BB_GOT_ENTRY_SIZE 8 +#endif + +#if defined(__sh__) +#define BB_USE_GOT_ENTRIES +#define BB_GOT_ENTRY_SIZE 4 +#endif + +#if defined(__i386__) +#define BB_USE_GOT_ENTRIES +#define BB_GOT_ENTRY_SIZE 4 +#endif + +#if defined(__mips__) +// neither used +#endif //---------------------------------------------------------------------------- //--------modutils module.h, lines 45-242 @@ -68,9 +117,9 @@ #ifndef MODUTILS_MODULE_H -#define MODUTILS_MODULE_H 1 +static const int MODUTILS_MODULE_H = 1; -#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" +#ident "$Id: insmod.c,v 1.53 2001/03/22 19:01:16 andersen 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 @@ -127,7 +176,7 @@ struct old_module }; /* Sent to init_module(2) or'ed into the code size parameter. */ -#define OLD_MOD_AUTOCLEAN 0x40000000 /* big enough, but no sign problems... */ +static const int OLD_MOD_AUTOCLEAN = 0x40000000; /* big enough, but no sign problems... */ int get_kernel_syms(struct old_kernel_sym *); int old_sys_init_module(const char *name, char *code, unsigned codesize, @@ -150,9 +199,9 @@ int old_sys_init_module(const char *name, char *code, unsigned codesize, #undef tgt_sizeof_char_p #undef tgt_sizeof_void_p #undef tgt_long -#define tgt_sizeof_long 8 -#define tgt_sizeof_char_p 8 -#define tgt_sizeof_void_p 8 +static const int tgt_sizeof_long = 8; +static const int tgt_sizeof_char_p = 8; +static const int tgt_sizeof_void_p = 8; #define tgt_long long long #endif @@ -214,11 +263,11 @@ struct new_module_info }; /* Bits of module.flags. */ -#define NEW_MOD_RUNNING 1 -#define NEW_MOD_DELETED 2 -#define NEW_MOD_AUTOCLEAN 4 -#define NEW_MOD_VISITED 8 -#define NEW_MOD_USED_ONCE 16 +static const int NEW_MOD_RUNNING = 1; +static const int NEW_MOD_DELETED = 2; +static const int NEW_MOD_AUTOCLEAN = 4; +static const int NEW_MOD_VISITED = 8; +static const int NEW_MOD_USED_ONCE = 16; int new_sys_init_module(const char *name, const struct new_module *); int query_module(const char *name, int which, void *buf, size_t bufsize, @@ -226,11 +275,11 @@ int query_module(const char *name, int which, void *buf, size_t bufsize, /* Values for query_module's which. */ -#define QM_MODULES 1 -#define QM_DEPS 2 -#define QM_REFS 3 -#define QM_SYMBOLS 4 -#define QM_INFO 5 +static const int QM_MODULES = 1; +static const int QM_DEPS = 2; +static const int QM_REFS = 3; +static const int QM_SYMBOLS = 4; +static const int QM_INFO = 5; /*======================================================================*/ /* The system calls unchanged between 2.0 and 2.1. */ @@ -274,9 +323,9 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H -#define MODUTILS_OBJ_H 1 +static const int MODUTILS_OBJ_H = 1; -#ident "$Id: insmod.c,v 1.22 2000/08/22 05:18:30 andersen Exp $" +#ident "$Id: insmod.c,v 1.53 2001/03/22 19:01:16 andersen Exp $" /* The relocatable object is manipulated using elfin types. */ @@ -286,14 +335,81 @@ int delete_module(const char *); /* Machine-specific elf macros for i386 et al. */ +/* the SH changes have only been tested on the SH4 in =little endian= mode */ +/* I'm not sure about big endian, so let's warn: */ + +#if (defined(__SH4__) || defined(__SH3__)) && defined(__BIG_ENDIAN__) +#error insmod.c may require changes for use on big endian SH4/SH3 +#endif + +/* it may or may not work on the SH1/SH2... So let's error on those + also */ +#if (defined(__sh__) && (!(defined(__SH3__) || defined(__SH4__)))) +#error insmod.c may require changes for non-SH3/SH4 use +#endif + #define ELFCLASSM ELFCLASS32 + +#if defined(__sh__) + +#define MATCH_MACHINE(x) (x == EM_SH) +#define SHT_RELM SHT_RELA +#define Elf32_RelM Elf32_Rela #define ELFDATAM ELFDATA2LSB +#elif defined(__arm__) + +#define MATCH_MACHINE(x) (x == EM_ARM) +#define SHT_RELM SHT_REL +#define Elf32_RelM Elf32_Rel +#define ELFDATAM ELFDATA2LSB + +#elif defined(__powerpc__) + +#define MATCH_MACHINE(x) (x == EM_PPC) +#define SHT_RELM SHT_RELA +#define Elf32_RelM Elf32_Rela +#define ELFDATAM ELFDATA2MSB + +#elif defined(__mips__) + +/* Account for ELF spec changes. */ +#ifndef EM_MIPS_RS3_LE +#ifdef EM_MIPS_RS4_BE +#define EM_MIPS_RS3_LE EM_MIPS_RS4_BE +#else +#define EM_MIPS_RS3_LE 10 +#endif +#endif /* !EM_MIPS_RS3_LE */ + +#define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE) +#define SHT_RELM SHT_REL +#define Elf32_RelM Elf32_Rel +#ifdef __MIPSEB__ +#define ELFDATAM ELFDATA2MSB +#endif +#ifdef __MIPSEL__ +#define ELFDATAM ELFDATA2LSB +#endif + +#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 #define MATCH_MACHINE(x) (x == EM_386 || x == EM_486) +#endif #define SHT_RELM SHT_REL #define Elf32_RelM Elf32_Rel +#define ELFDATAM ELFDATA2LSB +#else +#error Sorry, but insmod.c does not yet support this architecture... +#endif #ifndef ElfW # if ELFCLASSM == ELFCLASS32 @@ -470,11 +586,7 @@ int arch_init_module (struct obj_file *f, struct new_module *); #define _PATH_MODULES "/lib/modules" -#define STRVERSIONLEN 32 - -#if !defined(BB_FEATURE_INSMOD_NEW_KERNEL) && !defined(BB_FEATURE_INSMOD_OLD_KERNEL) -#error "Must have ether BB_FEATURE_INSMOD_NEW_KERNEL or BB_FEATURE_INSMOD_OLD_KERNEL defined" -#endif +static const int STRVERSIONLEN = 32; /*======================================================================*/ @@ -486,24 +598,66 @@ int flag_export = 1; /*======================================================================*/ -struct i386_got_entry { +/* previously, these were named i386_* but since we could be + compiling for the sh, I've renamed them to the more general + arch_* These structures are the same between the x86 and SH, + and we can't support anything else right now anyway. In the + future maybe they should be #if defined'd */ + +/* Done ;-) */ + + + +#if defined(BB_USE_PLT_ENTRIES) +struct arch_plt_entry +{ + int offset; + int allocated:1; + int inited:1; /* has been set up */ +}; +#endif + +#if defined(BB_USE_GOT_ENTRIES) +struct arch_got_entry { int offset; unsigned offset_done:1; unsigned reloc_done:1; }; +#endif -struct i386_file { +#if defined(__mips__) +struct mips_hi16 +{ + struct mips_hi16 *next; + Elf32_Addr *addr; + Elf32_Addr value; +}; +#endif + +struct arch_file { struct obj_file root; +#if defined(BB_USE_PLT_ENTRIES) + struct obj_section *plt; +#endif +#if defined(BB_USE_GOT_ENTRIES) struct obj_section *got; +#endif +#if defined(__mips__) + struct mips_hi16 *mips_hi16_list; +#endif }; -struct i386_symbol { +struct arch_symbol { struct obj_symbol root; - struct i386_got_entry gotent; +#if defined(BB_USE_PLT_ENTRIES) + struct arch_plt_entry pltent; +#endif +#if defined(BB_USE_GOT_ENTRIES) + struct arch_got_entry gotent; +#endif }; - struct external_module { const char *name; ElfW(Addr) addr; @@ -535,7 +689,23 @@ _syscall1(int, delete_module, const char *, name) extern int delete_module(const char *); #endif -#if defined(__i386__) || defined(__m68k__) || defined(__arm__) +/* This is kind of troublesome. See, we don't actually support + the m68k or the arm the same way we support i386 and (now) + sh. In doing my SH patch, I just assumed that whatever works + for i386 also works for m68k and arm since currently insmod.c + does nothing special for them. If this isn't true, the below + line is rather misleading IMHO, and someone should either + change it or add more proper architecture-dependent support + for these boys. + + -- Bryan Rittmeyer */ + +#ifdef BB_FEATURE_OLD_MODULE_INTERFACE +_syscall1(int, get_kernel_syms, struct old_kernel_sym *, ks) +#endif + +#if defined(__i386__) || defined(__m68k__) || defined(__arm__) \ + || defined(__powerpc__) /* Jump through hoops to fixup error return codes */ #define __NR__create_module __NR_create_module static inline _syscall2(long, _create_module, const char *, name, size_t, @@ -553,8 +723,8 @@ unsigned long create_module(const char *name, size_t size) #else _syscall2(unsigned long, create_module, const char *, name, size_t, size) #endif -static char m_filename[BUFSIZ + 1] = "\0"; -static char m_fullName[BUFSIZ + 1] = "\0"; +static char m_filename[BUFSIZ + 1]; +static char m_fullName[BUFSIZ + 1]; /*======================================================================*/ @@ -568,7 +738,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; @@ -588,9 +758,19 @@ static int findNamedModule(const char *fileName, struct stat *statbuf, struct obj_file *arch_new_file(void) { - struct i386_file *f; + struct arch_file *f; f = xmalloc(sizeof(*f)); + +#if defined(BB_USE_PLT_ENTRIES) + f->plt = NULL; +#endif +#if defined(BB_USE_GOT_ENTRIES) f->got = NULL; +#endif +#if defined(__mips__) + f->mips_hi16_list = NULL; +#endif + return &f->root; } @@ -601,70 +781,325 @@ struct obj_section *arch_new_section(void) struct obj_symbol *arch_new_symbol(void) { - struct i386_symbol *sym; + struct arch_symbol *sym; sym = xmalloc(sizeof(*sym)); + +#if defined(BB_USE_PLT_ENTRIES) + memset(&sym->pltent, 0, sizeof(sym->pltent)); +#endif +#if defined(BB_USE_GOT_ENTRIES) memset(&sym->gotent, 0, sizeof(sym->gotent)); +#endif + return &sym->root; } + enum obj_reloc arch_apply_relocation(struct obj_file *f, struct obj_section *targsec, struct obj_section *symsec, struct obj_symbol *sym, - Elf32_Rel * rel, Elf32_Addr v) + ElfW(RelM) *rel, ElfW(Addr) v) { - struct i386_file *ifile = (struct i386_file *) f; - struct i386_symbol *isym = (struct i386_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; + struct arch_file *ifile = (struct arch_file *) f; +#if !(defined(__mips__)) + struct arch_symbol *isym = (struct arch_symbol *) sym; +#endif + ElfW(Addr) *loc = (ElfW(Addr) *) (targsec->contents + rel->r_offset); + ElfW(Addr) dot = targsec->header.sh_addr + rel->r_offset; +#if defined(BB_USE_GOT_ENTRIES) + ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0; +#endif +#if defined(BB_USE_PLT_ENTRIES) + ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0; + struct arch_plt_entry *pe; + unsigned long *ip; +#endif enum obj_reloc ret = obj_reloc_ok; switch (ELF32_R_TYPE(rel->r_info)) { + +/* even though these constants seem to be the same for + the i386 and the sh, we "#if define" them for clarity + and in case that ever changes */ +#if defined(__sh__) + case R_SH_NONE: +#elif defined(__arm__) + case R_ARM_NONE: +#elif defined(__i386__) case R_386_NONE: +#elif defined(__powerpc__) + case R_PPC_NONE: +#elif defined(__mips__) + case R_MIPS_NONE: +#endif break; - case R_386_32: +#if defined(__sh__) + case R_SH_DIR32: +#elif defined(__arm__) + case R_ARM_ABS32: +#elif defined(__i386__) + case R_386_32: +#elif defined(__powerpc__) + case R_PPC_ADDR32: +#elif defined(__mips__) + case R_MIPS_32: +#endif *loc += v; break; +#if defined(__powerpc__) + case R_PPC_ADDR16_HA: + *(unsigned short *)loc = (v + 0x8000) >> 16; + break; + + case R_PPC_ADDR16_HI: + *(unsigned short *)loc = v >> 16; + break; + + case R_PPC_ADDR16_LO: + *(unsigned short *)loc = v; + break; +#endif + +#if defined(__mips__) + case R_MIPS_26: + if (v % 4) + ret = obj_reloc_dangerous; + if ((v & 0xf0000000) != ((dot + 4) & 0xf0000000)) + ret = obj_reloc_overflow; + *loc = + (*loc & ~0x03ffffff) | ((*loc + (v >> 2)) & + 0x03ffffff); + break; + + case R_MIPS_HI16: + { + struct mips_hi16 *n; + + /* We cannot relocate this one now because we don't know the value + of the carry we need to add. Save the information, and let LO16 + do the actual relocation. */ + n = (struct mips_hi16 *) xmalloc(sizeof *n); + n->addr = loc; + n->value = v; + n->next = ifile->mips_hi16_list; + ifile->mips_hi16_list = n; + break; + } + + case R_MIPS_LO16: + { + unsigned long insnlo = *loc; + Elf32_Addr val, vallo; + + /* Sign extend the addend we extract from the lo insn. */ + vallo = ((insnlo & 0xffff) ^ 0x8000) - 0x8000; + + if (ifile->mips_hi16_list != NULL) { + struct mips_hi16 *l; + + l = ifile->mips_hi16_list; + while (l != NULL) { + struct mips_hi16 *next; + unsigned long insn; + + /* The value for the HI16 had best be the same. */ + assert(v == l->value); + + /* Do the HI16 relocation. Note that we actually don't + need to know anything about the LO16 itself, except where + to find the low 16 bits of the addend needed by the LO16. */ + insn = *l->addr; + val = + ((insn & 0xffff) << 16) + + vallo; + val += v; + + /* Account for the sign extension that will happen in the + low bits. */ + val = + ((val >> 16) + + ((val & 0x8000) != + 0)) & 0xffff; + + insn = (insn & ~0xffff) | val; + *l->addr = insn; + + next = l->next; + free(l); + l = next; + } + + ifile->mips_hi16_list = NULL; + } + + /* Ok, we're done with the HI16 relocs. Now deal with the LO16. */ + val = v + vallo; + insnlo = (insnlo & ~0xffff) | (val & 0xffff); + *loc = insnlo; + break; + } +#endif + +#if defined(__arm__) +#elif defined(__sh__) + case R_SH_REL32: + *loc += v - dot; + break; +#elif defined(__i386__) case R_386_PLT32: case R_386_PC32: *loc += v - dot; break; +#elif defined(__powerpc__) + case R_PPC_REL32: + *loc = v - dot; + break; +#endif + +#if defined(__sh__) + case R_SH_PLT32: + *loc = v - dot; + break; +#elif defined(__i386__) +#endif + +#if defined(BB_USE_PLT_ENTRIES) + +#if defined(__arm__) + case R_ARM_PC24: + case R_ARM_PLT32: +#endif +#if defined(__powerpc__) + case R_PPC_REL24: +#endif + /* find the plt entry and initialize it if necessary */ + assert(isym != NULL); + + pe = (struct arch_plt_entry*) &isym->pltent; + + if (! pe->inited) { + ip = (unsigned long *) (ifile->plt->contents + pe->offset); + + /* generate some machine code */ +#if defined(__arm__) + ip[0] = 0xe51ff004; /* ldr pc,[pc,#-4] */ + ip[1] = v; /* sym@ */ +#endif +#if defined(__powerpc__) + ip[0] = 0x3d600000 + ((v + 0x8000) >> 16); /* lis r11,sym@ha */ + ip[1] = 0x396b0000 + (v & 0xffff); /* addi r11,r11,sym@l */ + ip[2] = 0x7d6903a6; /* mtctr r11 */ + ip[3] = 0x4e800420; /* bctr */ +#endif + 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; + + /* merge the offset into the instruction. */ +#if defined(__arm__) + /* Convert to words. */ + v >>= 2; + + *loc = (*loc & ~0x00ffffff) | ((v + *loc) & 0x00ffffff); +#endif +#if defined(__powerpc__) + *loc = (*loc & ~0x03fffffc) | (v & 0x03fffffc); +#endif + break; +#endif /* BB_USE_PLT_ENTRIES */ + +#if defined(__arm__) +#elif defined(__sh__) + case R_SH_GLOB_DAT: + case R_SH_JMP_SLOT: + *loc = v; + break; +#elif defined(__i386__) case R_386_GLOB_DAT: case R_386_JMP_SLOT: *loc = v; break; +#endif - case R_386_RELATIVE: +#if defined(__arm__) +#elif defined(__sh__) + case R_SH_RELATIVE: + *loc += f->baseaddr + rel->r_addend; + break; +#elif defined(__i386__) + case R_386_RELATIVE: *loc += f->baseaddr; break; +#endif + +#if defined(BB_USE_GOT_ENTRIES) +#if defined(__sh__) + case R_SH_GOTPC: +#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; +#endif break; +#if defined(__sh__) + case R_SH_GOT32: +#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; +#endif break; + /* address relative to the got */ +#if defined(__sh__) + case R_SH_GOTOFF: +#elif defined(__arm__) + case R_ARM_GOTOFF: +#elif defined(__i386__) case R_386_GOTOFF: +#endif assert(got != 0); *loc += v - got; break; +#endif /* BB_USE_GOT_ENTRIES */ + default: + printf("Warning: unhandled reloc %d\n",(int)ELF32_R_TYPE(rel->r_info)); ret = obj_reloc_unhandled; break; } @@ -674,64 +1109,129 @@ arch_apply_relocation(struct obj_file *f, int arch_create_got(struct obj_file *f) { - struct i386_file *ifile = (struct i386_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; - Elf32_Rel *rel, *relend; - Elf32_Sym *symtab; - const char *strtab; +#if defined(BB_USE_GOT_ENTRIES) || defined(BB_USE_PLT_ENTRIES) + struct arch_file *ifile = (struct arch_file *) f; + int i; +#if defined(BB_USE_GOT_ENTRIES) + int got_offset = 0, gotneeded = 0; +#endif +#if defined(BB_USE_PLT_ENTRIES) + int plt_offset = 0, pltneeded = 0; +#endif + 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]; - rel = (Elf32_Rel *) relsec->contents; - relend = rel + (relsec->header.sh_size / sizeof(Elf32_Rel)); - 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 i386_symbol *intsym; - const char *name; + extsym = &symtab[ELF32_R_SYM(rel->r_info)]; switch (ELF32_R_TYPE(rel->r_info)) { +#if defined(__arm__) + case R_ARM_GOT32: + break; +#elif defined(__sh__) + case R_SH_GOT32: + break; +#elif defined(__i386__) + case R_386_GOT32: + break; +#endif + +#if defined(__powerpc__) + case R_PPC_REL24: + pltneeded = 1; + break; +#endif + +#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: + gotneeded = 1; +#elif defined(__i386__) case R_386_GOTPC: case R_386_GOTOFF: gotneeded = 1; +#endif + default: continue; - - case R_386_GOT32: - 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 i386_symbol *) obj_find_symbol(&ifile->root, name); - + } + intsym = (struct arch_symbol *) obj_find_symbol(f, name); +#if defined(BB_USE_GOT_ENTRIES) if (!intsym->gotent.offset_done) { intsym->gotent.offset_done = 1; - intsym->gotent.offset = offset; - offset += 4; + intsym->gotent.offset = got_offset; + got_offset += BB_GOT_ENTRY_SIZE; + } +#endif +#if defined(BB_USE_PLT_ENTRIES) + if (pltneeded && intsym->pltent.allocated == 0) { + intsym->pltent.allocated = 1; + intsym->pltent.offset = plt_offset; + plt_offset += BB_PLT_ENTRY_SIZE; + intsym->pltent.inited = 0; + pltneeded = 0; + } +#endif } } - } - if (offset > 0 || gotneeded) - ifile->got = - obj_create_alloced_section(&ifile->root, ".got", 4, offset); +#if defined(BB_USE_GOT_ENTRIES) + 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", + BB_GOT_ENTRY_SIZE, + got_offset); + assert(relsec); + } + + ifile->got = relsec; + } +#endif + +#if defined(BB_USE_PLT_ENTRIES) + if (plt_offset) + ifile->plt = obj_create_alloced_section(f, ".plt", + BB_PLT_ENTRY_SIZE, + plt_offset); +#endif +#endif return 1; } @@ -913,7 +1413,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", name); return sym; } } @@ -1176,7 +1676,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", p); return 0; } @@ -1189,7 +1689,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", p); return 0; } else if (*q == '\\') switch (*++q) { @@ -1305,11 +1805,11 @@ old_get_module_version(struct obj_file *f, char str[STRVERSIONLEN]) #endif /* BB_FEATURE_INSMOD_VERSION_CHECKING */ -#ifdef BB_FEATURE_INSMOD_OLD_KERNEL +#ifdef BB_FEATURE_OLD_MODULE_INTERFACE /* Fetch all the symbols and divvy them up as appropriate for the modules. */ -static int old_get_kernel_symbols(void) +static int old_get_kernel_symbols(const char *m_name) { struct old_kernel_sym *ks, *k; struct new_module_symbol *s; @@ -1318,7 +1818,7 @@ static int old_get_kernel_symbols(void) nks = get_kernel_syms(NULL); if (nks < 0) { - errorMsg("get_kernel_syms: %s: %s", m_name, strerror(errno)); + perror_msg("get_kernel_syms: %s", m_name); return 0; } @@ -1460,7 +1960,8 @@ 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; + strcpy(str, sym->name); + str += strlen(sym->name) + 1; ksym++; } } @@ -1499,7 +2000,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)); + perror_msg("init_module: %s", m_name); free(image); free(symtab); @@ -1512,7 +2013,7 @@ old_init_module(const char *m_name, struct obj_file *f, #define old_create_mod_use_count(x) TRUE #define old_init_module(x, y, z) TRUE -#endif /* BB_FEATURE_INSMOD_OLD_KERNEL */ +#endif /* BB_FEATURE_OLD_MODULE_INTERFACE */ @@ -1542,7 +2043,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", key); return 0; } @@ -1550,7 +2051,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", key); return 0; } @@ -1578,7 +2079,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", key); return 0; } else if (*q == '\\') @@ -1672,15 +2173,15 @@ 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" - " the maximum size\n", key); + error_msg("parameter type 'c' for %s must be followed by" + " the maximum size", key); return 0; } charssize = strtoul(p + 1, (char **) NULL, 10); /* 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)", key, charssize - 1); return 0; } @@ -1709,7 +2210,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", *p, key); return 0; } } @@ -1728,21 +2229,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)", key, max); return 0; } ++q; break; default: - errorMsg("invalid argument syntax for %s\n", key); + error_msg("invalid argument syntax for %s", 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)", key, min); return 0; } @@ -1791,7 +2292,7 @@ new_get_module_version(struct obj_file *f, char str[STRVERSIONLEN]) #endif /* BB_FEATURE_INSMOD_VERSION_CHECKING */ -#ifdef BB_FEATURE_INSMOD_NEW_KERNEL +#ifdef BB_FEATURE_NEW_MODULE_INTERFACE /* Fetch the loaded modules, and all currently exported symbols. */ @@ -1811,53 +2312,55 @@ static int new_get_kernel_symbols(void) module_names = xrealloc(module_names, bufsize = ret); goto retry_modules_load; } - errorMsg("QM_MODULES: %s", strerror(errno)); + perror_msg("QM_MODULES"); return 0; } n_ext_modules = nmod = ret; - ext_modules = modules = xmalloc(nmod * sizeof(*modules)); - memset(modules, 0, nmod * sizeof(*modules)); /* Collect the modules' symbols. */ - for (i = 0, mn = module_names, m = modules; - i < nmod; ++i, ++m, mn += strlen(mn) + 1) { - struct new_module_info info; - - if (query_module(mn, QM_INFO, &info, sizeof(info), &ret)) { - if (errno == ENOENT) { - /* The module was removed out from underneath us. */ - continue; - } - errorMsg("query_module: QM_INFO: %s: %s", mn, strerror(errno)); - return 0; - } - - syms = xmalloc(bufsize = 1024); - retry_mod_sym_load: - if (query_module(mn, QM_SYMBOLS, syms, bufsize, &ret)) { - switch (errno) { - case ENOSPC: - syms = xrealloc(syms, bufsize = ret); - goto retry_mod_sym_load; - case ENOENT: - /* The module was removed out from underneath us. */ - continue; - default: - errorMsg("query_module: QM_SYMBOLS: %s: %s", mn, strerror(errno)); + if (nmod){ + ext_modules = modules = xmalloc(nmod * sizeof(*modules)); + memset(modules, 0, nmod * sizeof(*modules)); + for (i = 0, mn = module_names, m = modules; + i < nmod; ++i, ++m, mn += strlen(mn) + 1) { + struct new_module_info info; + + if (query_module(mn, QM_INFO, &info, sizeof(info), &ret)) { + if (errno == ENOENT) { + /* The module was removed out from underneath us. */ + continue; + } + perror_msg("query_module: QM_INFO: %s", mn); return 0; } - } - nsyms = ret; - - m->name = mn; - m->addr = info.addr; - m->nsyms = nsyms; - m->syms = syms; - - for (j = 0, s = syms; j < nsyms; ++j, ++s) { - s->name += (unsigned long) syms; + + syms = xmalloc(bufsize = 1024); + retry_mod_sym_load: + if (query_module(mn, QM_SYMBOLS, syms, bufsize, &ret)) { + switch (errno) { + case ENOSPC: + syms = xrealloc(syms, bufsize = ret); + goto retry_mod_sym_load; + case ENOENT: + /* The module was removed out from underneath us. */ + continue; + default: + perror_msg("query_module: QM_SYMBOLS: %s", mn); + return 0; + } + } + nsyms = ret; + + m->name = mn; + m->addr = info.addr; + m->nsyms = nsyms; + m->syms = syms; + + for (j = 0, s = syms; j < nsyms; ++j, ++s) { + s->name += (unsigned long) syms; + } } } @@ -1870,7 +2373,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)); + perror_msg("kernel: QM_SYMBOLS"); return 0; } nksyms = nsyms = ret; @@ -2051,7 +2554,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)); + perror_msg("init_module: %s", m_name); free(image); @@ -2063,8 +2566,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_NEW_MODULE_INTERFACE */ /*======================================================================*/ @@ -2127,7 +2631,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", sym->name); ret = 0; } } @@ -2234,8 +2738,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; } } @@ -2350,11 +2858,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", 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", errmsg, (long) ELFW(R_TYPE) (rel->r_info)); } ret = 0; @@ -2400,7 +2908,7 @@ int obj_create_image(struct obj_file *f, char *image) for (sec = f->load_order; sec; sec = sec->load_next) { char *secimg; - if (sec->header.sh_size == 0) + if (sec->contents == 0 || sec->header.sh_size == 0) continue; secimg = image + (sec->header.sh_addr - base); @@ -2431,7 +2939,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)); + perror_msg("error reading ELF header"); return NULL; } @@ -2439,25 +2947,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"); 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"); 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"); 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", (unsigned long) f->header.e_shentsize, (unsigned long) sizeof(ElfW(Shdr))); return NULL; @@ -2470,7 +2978,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)); + perror_msg("error reading ELF section headers"); return NULL; } @@ -2485,7 +2993,7 @@ struct obj_file *obj_load(FILE * fp) sec->header = section_headers[i]; sec->idx = i; - switch (sec->header.sh_type) { + if(sec->header.sh_size) switch (sec->header.sh_type) { case SHT_NULL: case SHT_NOTE: case SHT_NOBITS: @@ -2500,7 +3008,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)); + perror_msg("error reading ELF section data"); return NULL; } } else { @@ -2510,11 +3018,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"); return NULL; #else case SHT_REL: - errorMsg("REL relocations not supported on this architecture\n"); + error_msg("REL relocations not supported on this architecture"); return NULL; #endif @@ -2527,7 +3035,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", (long) sec->header.sh_type); return NULL; } @@ -2556,7 +3064,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", (unsigned long) sec->header.sh_entsize, (unsigned long) sizeof(ElfW(Sym))); return NULL; @@ -2588,7 +3096,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", (unsigned long) sec->header.sh_entsize, (unsigned long) sizeof(ElfW(RelM))); return NULL; @@ -2622,6 +3130,7 @@ static void hide_special_symbols(struct obj_file *f) extern int insmod_main( int argc, char **argv) { + int opt; int k_crcs; int k_new_syscalls; int len; @@ -2630,8 +3139,9 @@ extern int insmod_main( int argc, char **argv) ElfW(Addr) m_addr; FILE *fp; struct obj_file *f; + struct stat st; 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; @@ -2641,15 +3151,9 @@ extern int insmod_main( int argc, char **argv) int m_crcs; #endif - - if (argc <= 1) { - usage(insmod_usage); - } - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { + while ((opt = getopt(argc, argv, "fkvxLo:")) > 0) { + switch (opt) { case 'f': /* force loading */ flag_force_load = 1; break; @@ -2662,51 +3166,61 @@ extern int insmod_main( int argc, char **argv) case 'x': /* do not export externs */ flag_export = 0; break; + case 'o': /* name the output module */ + strncpy(m_name, optarg, BUFSIZ); + break; + case 'L': /* Stub warning */ + /* This is needed for compatibility with modprobe. + * In theory, this does locking, but we don't do + * that. So be careful and plan your life around not + * loading the same module 50 times concurrently. */ + break; default: - usage(insmod_usage); - } + show_usage(); } } - - if (argc <= 0) { - usage(insmod_usage); + + if (argv[optind] == NULL) { + show_usage(); } + /* Grab the module name */ - if ((tmp = strrchr(*argv, '/')) != NULL) { + if ((tmp = strrchr(argv[optind], '/')) != NULL) { tmp++; } else { - tmp = *argv; + tmp = argv[optind]; } len = strlen(tmp); if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') len -= 2; - memcpy(m_name, tmp, len); - strcpy(m_fullName, m_name); + strncpy(m_fullName, tmp, len); + if (*m_name == '\0') { + strcpy(m_name, m_fullName); + } strcat(m_fullName, ".o"); /* Get a filedesc for the module */ - if ((fp = fopen(*argv, "r")) == NULL) { + if (stat(argv[optind], &st) < 0 || !S_ISREG(st.st_mode) || + (fp = fopen(argv[optind], "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'", 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'", m_fullName, _PATH_MODULES); } else - memcpy(m_filename, *argv, strlen(*argv)); + memcpy(m_filename, argv[optind], strlen(argv[optind])); - if ((f = obj_load(fp)) == NULL) { - perror("Could not load the module\n"); - exit(FALSE); - } + if ((f = obj_load(fp)) == NULL) + perror_msg_and_die("Could not load the module"); if (get_modinfo_value(f, "kernel_version") == NULL) m_has_modinfo = 0; @@ -2722,22 +3236,22 @@ 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 " - "compiled for\n"); + error_msg("couldn't find the kernel version the module was " + "compiled for"); goto out; } } 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", + "\twhile this kernel is version %s", 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", + "\twhile this kernel is version %s.", m_filename, m_strversion, k_strversion); goto out; } @@ -2748,21 +3262,21 @@ extern int insmod_main( int argc, char **argv) k_new_syscalls = !query_module(NULL, 0, NULL, 0, NULL); if (k_new_syscalls) { -#ifdef BB_FEATURE_INSMOD_NEW_KERNEL +#ifdef BB_FEATURE_NEW_MODULE_INTERFACE if (!new_get_kernel_symbols()) 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"); goto out; #endif } else { -#ifdef BB_FEATURE_INSMOD_OLD_KERNEL - if (!old_get_kernel_symbols()) +#ifdef BB_FEATURE_OLD_MODULE_INTERFACE + if (!old_get_kernel_symbols(m_name)) 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"); goto out; #endif } @@ -2794,6 +3308,9 @@ extern int insmod_main( int argc, char **argv) } obj_allocate_commons(f); + /* done with the module name, on to the optional var=value arguments */ + ++optind; + if (optind < argc) { if (m_has_modinfo ? !new_process_module_arguments(f, argc - optind, argv + optind) @@ -2813,20 +3330,17 @@ extern int insmod_main( int argc, char **argv) m_size = obj_load_size(f); - errno = 0; m_addr = create_module(m_name, m_size); - switch (errno) { - case 0: - break; + if (m_addr==-1) switch (errno) { case EEXIST: - errorMsg("A module named %s already exists\n", m_name); + error_msg("A module named %s already exists", 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", m_size); goto out; default: - errorMsg("create_module: %s: %s", m_name, strerror(errno)); + perror_msg("create_module: %s", m_name); goto out; } @@ -2843,7 +3357,7 @@ extern int insmod_main( int argc, char **argv) goto out; } - exit_status = TRUE; + exit_status = EXIT_SUCCESS; out: fclose(fp);