|
|
|
|
@ -1,35 +1,17 @@ |
|
|
|
|
--- a/modutils/insmod.c
|
|
|
|
|
+++ b/modutils/insmod.c
|
|
|
|
|
@@ -61,21 +61,117 @@
|
|
|
|
|
@@ -9,6 +9,99 @@
|
|
|
|
|
|
|
|
|
|
#include "libbb.h"
|
|
|
|
|
#include <libgen.h>
|
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
|
+#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
#include "modutils.h"
|
|
|
|
|
+#ifndef CONFIG_FEATURE_2_4_MODULES
|
|
|
|
|
+#include <sys/mman.h>
|
|
|
|
|
+#include <asm/unistd.h>
|
|
|
|
|
+#include <sys/syscall.h>
|
|
|
|
|
+#include <sys/utsname.h>
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
#if !ENABLE_FEATURE_2_4_MODULES && !ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
#undef ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
#define ENABLE_FEATURE_2_4_MODULES 1
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-/*
|
|
|
|
|
- * Big piece of 2.4-specific code
|
|
|
|
|
- */
|
|
|
|
|
#if ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
-
|
|
|
|
|
+int insmod_main_24(int argc, char **argv);
|
|
|
|
|
+#endif
|
|
|
|
|
#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
-static int insmod_ng_main(int argc, char **argv);
|
|
|
|
|
+int insmod_main_26(int argc, char **argv);
|
|
|
|
|
#endif
|
|
|
|
|
+int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
|
|
+
|
|
|
|
|
+static char *g_filename = NULL;
|
|
|
|
|
+#define _PATH_MODULES "/lib/modules"
|
|
|
|
|
+
|
|
|
|
|
+static int FAST_FUNC check_module_name_match(const char *filename, struct stat *statbuf,
|
|
|
|
|
+ void *userdata, int depth)
|
|
|
|
|
@ -92,7 +74,7 @@ |
|
|
|
|
+ * follow symlinks, but we do want to follow the
|
|
|
|
|
+ * /lib/modules/`uname -r` dir, So resolve it ourselves
|
|
|
|
|
+ * if it is a link... */
|
|
|
|
|
+ module_dir = concat_path_file(_PATH_MODULES, myuname.release);
|
|
|
|
|
+ module_dir = concat_path_file(CONFIG_DEFAULT_MODULES_DIR, myuname.release);
|
|
|
|
|
+ if (realpath(module_dir, real_module_dir) != NULL) {
|
|
|
|
|
+ free(module_dir);
|
|
|
|
|
+ module_dir = real_module_dir;
|
|
|
|
|
@ -112,623 +94,26 @@ |
|
|
|
|
+
|
|
|
|
|
+done:
|
|
|
|
|
+ free(filename);
|
|
|
|
|
|
|
|
|
|
+ return ret;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/*
|
|
|
|
|
+ * Big piece of 2.4-specific code
|
|
|
|
|
+ */
|
|
|
|
|
+#if ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
#if ENABLE_FEATURE_INSMOD_LOADINKMEM
|
|
|
|
|
#define LOADBITS 0
|
|
|
|
|
#else
|
|
|
|
|
@@ -184,7 +280,6 @@ static int insmod_ng_main(int argc, char
|
|
|
|
|
/* Microblaze */
|
|
|
|
|
#if defined(__microblaze__)
|
|
|
|
|
#define USE_SINGLE
|
|
|
|
|
-#include <linux/elf-em.h>
|
|
|
|
|
#define MATCH_MACHINE(x) (x == EM_XILINX_MICROBLAZE)
|
|
|
|
|
#define SHT_RELM SHT_RELA
|
|
|
|
|
#define Elf32_RelM Elf32_Rela
|
|
|
|
|
@@ -452,7 +547,7 @@ enum {
|
|
|
|
|
/* The system calls unchanged between 2.0 and 2.1. */
|
|
|
|
|
|
|
|
|
|
unsigned long create_module(const char *, size_t);
|
|
|
|
|
-int delete_module(const char *module, unsigned int flags);
|
|
|
|
|
+int delete_module(const char *);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* module.h */
|
|
|
|
|
@@ -652,7 +747,7 @@ static struct obj_symbol *arch_new_symbo
|
|
|
|
|
|
|
|
|
|
static enum obj_reloc arch_apply_relocation(struct obj_file *f,
|
|
|
|
|
struct obj_section *targsec,
|
|
|
|
|
- /*struct obj_section *symsec,*/
|
|
|
|
|
+ struct obj_section *symsec,
|
|
|
|
|
struct obj_symbol *sym,
|
|
|
|
|
ElfW(RelM) *rel, ElfW(Addr) value);
|
|
|
|
|
|
|
|
|
|
@@ -673,6 +768,7 @@ static int obj_gpl_license(struct obj_fi
|
|
|
|
|
#define SPFX ""
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
enum { STRVERSIONLEN = 64 };
|
|
|
|
|
|
|
|
|
|
/*======================================================================*/
|
|
|
|
|
@@ -788,28 +884,6 @@ static char *m_filename;
|
|
|
|
|
static char *m_fullName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-/*======================================================================*/
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-static int FAST_FUNC check_module_name_match(const char *filename,
|
|
|
|
|
- struct stat *statbuf UNUSED_PARAM,
|
|
|
|
|
- void *userdata, int depth UNUSED_PARAM)
|
|
|
|
|
-{
|
|
|
|
|
- char *fullname = (char *) userdata;
|
|
|
|
|
- char *tmp;
|
|
|
|
|
-
|
|
|
|
|
- if (fullname[0] == '\0')
|
|
|
|
|
- return FALSE;
|
|
|
|
|
-
|
|
|
|
|
- tmp = bb_get_last_path_component_nostrip(filename);
|
|
|
|
|
- if (strcmp(tmp, fullname) == 0) {
|
|
|
|
|
- /* Stop searching if we find a match */
|
|
|
|
|
- m_filename = xstrdup(filename);
|
|
|
|
|
- return FALSE;
|
|
|
|
|
- }
|
|
|
|
|
- return TRUE;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
/*======================================================================*/
|
|
|
|
|
|
|
|
|
|
@@ -835,32 +909,20 @@ static struct obj_symbol *arch_new_symbo
|
|
|
|
|
static enum obj_reloc
|
|
|
|
|
arch_apply_relocation(struct obj_file *f,
|
|
|
|
|
struct obj_section *targsec,
|
|
|
|
|
- /*struct obj_section *symsec,*/
|
|
|
|
|
+ struct obj_section *symsec,
|
|
|
|
|
struct obj_symbol *sym,
|
|
|
|
|
ElfW(RelM) *rel, ElfW(Addr) v)
|
|
|
|
|
{
|
|
|
|
|
-#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
|
|
|
|
|
- || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \
|
|
|
|
|
- || defined(__powerpc__) || defined(__mips__)
|
|
|
|
|
struct arch_file *ifile = (struct arch_file *) f;
|
|
|
|
|
-#endif
|
|
|
|
|
enum obj_reloc ret = obj_reloc_ok;
|
|
|
|
|
ElfW(Addr) *loc = (ElfW(Addr) *) (targsec->contents + rel->r_offset);
|
|
|
|
|
-#if defined(__arm__) || defined(__H8300H__) || defined(__H8300S__) \
|
|
|
|
|
- || defined(__i386__) || defined(__mc68000__) || defined(__microblaze__) \
|
|
|
|
|
- || defined(__mips__) || defined(__nios2__) || defined(__powerpc__) \
|
|
|
|
|
- || defined(__s390__) || defined(__sh__) || defined(__x86_64__)
|
|
|
|
|
ElfW(Addr) dot = targsec->header.sh_addr + rel->r_offset;
|
|
|
|
|
-#endif
|
|
|
|
|
#if defined(USE_GOT_ENTRIES) || defined(USE_PLT_ENTRIES)
|
|
|
|
|
struct arch_symbol *isym = (struct arch_symbol *) sym;
|
|
|
|
|
#endif
|
|
|
|
|
-#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
|
|
|
|
|
- || defined(__sh__) || defined(__s390__)
|
|
|
|
|
#if defined(USE_GOT_ENTRIES)
|
|
|
|
|
ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0;
|
|
|
|
|
#endif
|
|
|
|
|
-#endif
|
|
|
|
|
#if defined(USE_PLT_ENTRIES)
|
|
|
|
|
ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0;
|
|
|
|
|
unsigned long *ip;
|
|
|
|
|
@@ -954,7 +1016,6 @@ arch_apply_relocation(struct obj_file *f
|
|
|
|
|
|
|
|
|
|
case R_386_PLT32:
|
|
|
|
|
case R_386_PC32:
|
|
|
|
|
- case R_386_GOTOFF:
|
|
|
|
|
*loc += v - dot;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
@@ -973,6 +1034,9 @@ arch_apply_relocation(struct obj_file *f
|
|
|
|
|
|
|
|
|
|
case R_386_GOT32:
|
|
|
|
|
goto bb_use_got;
|
|
|
|
|
+
|
|
|
|
|
+ case R_386_GOTOFF:
|
|
|
|
|
+ *loc += v - got;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
#elif defined(__microblaze__)
|
|
|
|
|
@@ -1764,7 +1828,7 @@ static int arch_list_add(ElfW(RelM) *rel
|
|
|
|
|
|
|
|
|
|
#if defined(USE_SINGLE)
|
|
|
|
|
|
|
|
|
|
-static int arch_single_init(/*ElfW(RelM) *rel,*/ struct arch_single_entry *single,
|
|
|
|
|
+static int arch_single_init(ElfW(RelM) *rel, struct arch_single_entry *single,
|
|
|
|
|
int offset, int size)
|
|
|
|
|
{
|
|
|
|
|
if (single->allocated == 0) {
|
|
|
|
|
@@ -1912,7 +1976,7 @@ static void arch_create_got(struct obj_f
|
|
|
|
|
#if defined(USE_GOT_ENTRIES)
|
|
|
|
|
if (got_allocate) {
|
|
|
|
|
got_offset += arch_single_init(
|
|
|
|
|
- /*rel,*/ &intsym->gotent,
|
|
|
|
|
+ rel, &intsym->gotent,
|
|
|
|
|
got_offset, GOT_ENTRY_SIZE);
|
|
|
|
|
|
|
|
|
|
got_needed = 1;
|
|
|
|
|
@@ -1926,7 +1990,7 @@ static void arch_create_got(struct obj_f
|
|
|
|
|
plt_offset, PLT_ENTRY_SIZE);
|
|
|
|
|
#else
|
|
|
|
|
plt_offset += arch_single_init(
|
|
|
|
|
- /*rel,*/ &intsym->pltent,
|
|
|
|
|
+ rel, &intsym->pltent,
|
|
|
|
|
plt_offset, PLT_ENTRY_SIZE);
|
|
|
|
|
#endif
|
|
|
|
|
plt_needed = 1;
|
|
|
|
|
@@ -1964,8 +2028,7 @@ static unsigned long obj_elf_hash_n(cons
|
|
|
|
|
while (n > 0) {
|
|
|
|
|
ch = *name++;
|
|
|
|
|
h = (h << 4) + ch;
|
|
|
|
|
- g = (h & 0xf0000000);
|
|
|
|
|
- if (g != 0) {
|
|
|
|
|
+ if ((g = (h & 0xf0000000)) != 0) {
|
|
|
|
|
h ^= g >> 24;
|
|
|
|
|
h &= ~g;
|
|
|
|
|
}
|
|
|
|
|
@@ -2044,7 +2107,7 @@ obj_add_symbol(struct obj_file *f, const
|
|
|
|
|
int n_type = ELF_ST_TYPE(info);
|
|
|
|
|
int n_binding = ELF_ST_BIND(info);
|
|
|
|
|
|
|
|
|
|
- for (sym = f->symtab[hash]; sym; sym = sym->next) {
|
|
|
|
|
+ for (sym = f->symtab[hash]; sym; sym = sym->next)
|
|
|
|
|
if (f->symbol_cmp(sym->name, name) == 0) {
|
|
|
|
|
int o_secidx = sym->secidx;
|
|
|
|
|
int o_info = sym->info;
|
|
|
|
|
@@ -2103,14 +2166,14 @@ obj_add_symbol(struct obj_file *f, const
|
|
|
|
|
return sym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
/* Completely new symbol. */
|
|
|
|
|
sym = arch_new_symbol();
|
|
|
|
|
sym->next = f->symtab[hash];
|
|
|
|
|
f->symtab[hash] = sym;
|
|
|
|
|
sym->ksymidx = -1;
|
|
|
|
|
- if (ELF_ST_BIND(info) == STB_LOCAL && symidx != (unsigned long)(-1)) {
|
|
|
|
|
+
|
|
|
|
|
+ if (ELF_ST_BIND(info) == STB_LOCAL && symidx != -1) {
|
|
|
|
|
if (symidx >= f->local_symtab_size)
|
|
|
|
|
bb_error_msg("local symbol %s with index %ld exceeds local_symtab_size %ld",
|
|
|
|
|
name, (long) symidx, (long) f->local_symtab_size);
|
|
|
|
|
@@ -3234,7 +3297,7 @@ static int obj_relocate(struct obj_file
|
|
|
|
|
|
|
|
|
|
/* Do it! */
|
|
|
|
|
switch (arch_apply_relocation
|
|
|
|
|
- (f, targsec, /*symsec,*/ intsym, rel, value)
|
|
|
|
|
+ (f, targsec, symsec, intsym, rel, value)
|
|
|
|
|
) {
|
|
|
|
|
case obj_reloc_ok:
|
|
|
|
|
break;
|
|
|
|
|
@@ -3313,11 +3376,11 @@ static int obj_create_image(struct obj_f
|
|
|
|
|
|
|
|
|
|
/*======================================================================*/
|
|
|
|
|
|
|
|
|
|
-static struct obj_file *obj_load(FILE *fp, int loadprogbits UNUSED_PARAM)
|
|
|
|
|
+static struct obj_file *obj_load(FILE *fp, int loadprogbits)
|
|
|
|
|
{
|
|
|
|
|
struct obj_file *f;
|
|
|
|
|
ElfW(Shdr) * section_headers;
|
|
|
|
|
- size_t shnum, i;
|
|
|
|
|
+ int shnum, i;
|
|
|
|
|
char *shstrtab;
|
|
|
|
|
|
|
|
|
|
/* Read the file header. */
|
|
|
|
|
@@ -3591,7 +3654,7 @@ static int obj_gpl_license(struct obj_fi
|
|
|
|
|
while (ptr < endptr) {
|
|
|
|
|
value = strchr(ptr, '=');
|
|
|
|
|
if (value && strncmp(ptr, "license", value-ptr) == 0) {
|
|
|
|
|
- unsigned i;
|
|
|
|
|
+ int i;
|
|
|
|
|
if (license)
|
|
|
|
|
*license = value+1;
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(gpl_licenses); ++i) {
|
|
|
|
|
@@ -3695,9 +3758,6 @@ static void check_tainted_module(struct
|
|
|
|
|
* start of some sections. this info is used by ksymoops to do better
|
|
|
|
|
* debugging.
|
|
|
|
|
*/
|
|
|
|
|
-#if !ENABLE_FEATURE_INSMOD_VERSION_CHECKING
|
|
|
|
|
-#define get_module_version(f, str) get_module_version(str)
|
|
|
|
|
-#endif
|
|
|
|
|
static int
|
|
|
|
|
get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
|
|
|
|
|
{
|
|
|
|
|
@@ -3730,8 +3790,7 @@ add_ksymoops_symbols(struct obj_file *f,
|
|
|
|
|
struct obj_symbol *sym;
|
|
|
|
|
char *name, *absolute_filename;
|
|
|
|
|
char str[STRVERSIONLEN];
|
|
|
|
|
- unsigned i;
|
|
|
|
|
- int l, lm_name, lfilename, use_ksymtab, version;
|
|
|
|
|
+ int i, l, lm_name, lfilename, use_ksymtab, version;
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
|
|
|
|
|
/* WARNING: was using realpath, but replaced by readlink to stop using
|
|
|
|
|
@@ -3922,145 +3981,57 @@ static void print_load_map(struct obj_fi
|
|
|
|
|
void print_load_map(struct obj_file *f);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
|
|
-int insmod_main(int argc, char **argv)
|
|
|
|
|
+int insmod_main_24( int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
char *opt_o, *arg1;
|
|
|
|
|
- int len;
|
|
|
|
|
int k_crcs;
|
|
|
|
|
- char *tmp, *tmp1;
|
|
|
|
|
unsigned long m_size;
|
|
|
|
|
ElfW(Addr) m_addr;
|
|
|
|
|
struct obj_file *f;
|
|
|
|
|
- struct stat st;
|
|
|
|
|
- char *m_name = NULL;
|
|
|
|
|
- int exit_status = EXIT_FAILURE;
|
|
|
|
|
+ char *tmp = NULL, *m_name = NULL;
|
|
|
|
|
+ int ret = EINVAL;
|
|
|
|
|
int m_has_modinfo;
|
|
|
|
|
#if ENABLE_FEATURE_INSMOD_VERSION_CHECKING
|
|
|
|
|
struct utsname uts_info;
|
|
|
|
|
char m_strversion[STRVERSIONLEN];
|
|
|
|
|
int m_version, m_crcs;
|
|
|
|
|
#endif
|
|
|
|
|
-#if ENABLE_FEATURE_CLEAN_UP
|
|
|
|
|
FILE *fp = NULL;
|
|
|
|
|
-#else
|
|
|
|
|
- FILE *fp;
|
|
|
|
|
-#endif
|
|
|
|
|
- int k_version = 0;
|
|
|
|
|
+ int k_version;
|
|
|
|
|
struct utsname myuname;
|
|
|
|
|
|
|
|
|
|
+ /* check the kernel version */
|
|
|
|
|
+ if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
|
|
|
|
|
+ return EINVAL;
|
|
|
|
|
+
|
|
|
|
|
+ k_version = myuname.release[2] - '0';
|
|
|
|
|
+ if (k_version > 4)
|
|
|
|
|
+ return ENOTSUP;
|
|
|
|
|
+
|
|
|
|
|
/* Parse any options */
|
|
|
|
|
getopt32(argv, OPTION_STR, &opt_o);
|
|
|
|
|
arg1 = argv[optind];
|
|
|
|
|
if (option_mask32 & OPT_o) { // -o /* name the output module */
|
|
|
|
|
- free(m_name);
|
|
|
|
|
m_name = xstrdup(opt_o);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (arg1 == NULL) {
|
|
|
|
|
+ if (arg1 == NULL)
|
|
|
|
|
bb_show_usage();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /* Grab the module name */
|
|
|
|
|
- tmp1 = xstrdup(arg1);
|
|
|
|
|
- tmp = basename(tmp1);
|
|
|
|
|
- len = strlen(tmp);
|
|
|
|
|
-
|
|
|
|
|
- if (uname(&myuname) == 0) {
|
|
|
|
|
- if (myuname.release[0] == '2') {
|
|
|
|
|
- k_version = myuname.release[2] - '0';
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
-#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
- if (k_version > 4 && len > 3 && tmp[len - 3] == '.'
|
|
|
|
|
- && tmp[len - 2] == 'k' && tmp[len - 1] == 'o'
|
|
|
|
|
- ) {
|
|
|
|
|
- len -= 3;
|
|
|
|
|
- tmp[len] = '\0';
|
|
|
|
|
- } else
|
|
|
|
|
-#endif
|
|
|
|
|
- if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') {
|
|
|
|
|
- len -= 2;
|
|
|
|
|
- tmp[len] = '\0';
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
- if (k_version > 4)
|
|
|
|
|
- m_fullName = xasprintf("%s.ko", tmp);
|
|
|
|
|
- else
|
|
|
|
|
-#endif
|
|
|
|
|
- m_fullName = xasprintf("%s.o", tmp);
|
|
|
|
|
+ ret = find_module(arg1);
|
|
|
|
|
+ if (ret)
|
|
|
|
|
+ goto out;
|
|
|
|
|
|
|
|
|
|
if (!m_name) {
|
|
|
|
|
- m_name = tmp;
|
|
|
|
|
- } else {
|
|
|
|
|
- free(tmp1);
|
|
|
|
|
- tmp1 = NULL; /* flag for free(m_name) before exit() */
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /* Get a filedesc for the module. Check that we have a complete path */
|
|
|
|
|
- if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode)
|
|
|
|
|
- || (fp = fopen_for_read(arg1)) == NULL
|
|
|
|
|
- ) {
|
|
|
|
|
- /* Hmm. Could not open it. First search under /lib/modules/`uname -r`,
|
|
|
|
|
- * but do not error out yet if we fail to find it... */
|
|
|
|
|
- if (k_version) { /* uname succeedd */
|
|
|
|
|
- char *module_dir;
|
|
|
|
|
- char *tmdn;
|
|
|
|
|
-
|
|
|
|
|
- tmdn = concat_path_file(CONFIG_DEFAULT_MODULES_DIR, myuname.release);
|
|
|
|
|
- /* Jump through hoops in case /lib/modules/`uname -r`
|
|
|
|
|
- * is a symlink. We do not want recursive_action to
|
|
|
|
|
- * follow symlinks, but we do want to follow the
|
|
|
|
|
- * /lib/modules/`uname -r` dir, So resolve it ourselves
|
|
|
|
|
- * if it is a link... */
|
|
|
|
|
- module_dir = xmalloc_readlink(tmdn);
|
|
|
|
|
- if (!module_dir)
|
|
|
|
|
- module_dir = xstrdup(tmdn);
|
|
|
|
|
- recursive_action(module_dir, ACTION_RECURSE,
|
|
|
|
|
- check_module_name_match, NULL, m_fullName, 0);
|
|
|
|
|
- free(module_dir);
|
|
|
|
|
- free(tmdn);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /* Check if we have found anything yet */
|
|
|
|
|
- if (!m_filename || ((fp = fopen_for_read(m_filename)) == NULL)) {
|
|
|
|
|
- int r;
|
|
|
|
|
- char *module_dir;
|
|
|
|
|
-
|
|
|
|
|
- free(m_filename);
|
|
|
|
|
- m_filename = NULL;
|
|
|
|
|
- module_dir = xmalloc_readlink(CONFIG_DEFAULT_MODULES_DIR);
|
|
|
|
|
- if (!module_dir)
|
|
|
|
|
- module_dir = xstrdup(CONFIG_DEFAULT_MODULES_DIR);
|
|
|
|
|
- /* No module found under /lib/modules/`uname -r`, this
|
|
|
|
|
- * time cast the net a bit wider. Search /lib/modules/ */
|
|
|
|
|
- r = recursive_action(module_dir, ACTION_RECURSE,
|
|
|
|
|
- check_module_name_match, NULL, m_fullName, 0);
|
|
|
|
|
- if (r)
|
|
|
|
|
- bb_error_msg_and_die("%s: module not found", m_fullName);
|
|
|
|
|
- free(module_dir);
|
|
|
|
|
- if (m_filename == NULL
|
|
|
|
|
- || ((fp = fopen_for_read(m_filename)) == NULL)
|
|
|
|
|
- ) {
|
|
|
|
|
- bb_error_msg_and_die("%s: module not found", m_fullName);
|
|
|
|
|
- }
|
|
|
|
|
+ tmp = xstrdup(arg1);
|
|
|
|
|
+ m_name = basename(tmp);
|
|
|
|
|
}
|
|
|
|
|
- } else
|
|
|
|
|
- m_filename = xstrdup(arg1);
|
|
|
|
|
-
|
|
|
|
|
- if (flag_verbose)
|
|
|
|
|
- printf("Using %s\n", m_filename);
|
|
|
|
|
|
|
|
|
|
-#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
- if (k_version > 4) {
|
|
|
|
|
- argv[optind] = m_filename;
|
|
|
|
|
- optind--;
|
|
|
|
|
- return insmod_ng_main(argc - optind, argv + optind);
|
|
|
|
|
+ fp = fopen_for_read(g_filename);
|
|
|
|
|
+ if (!fp) {
|
|
|
|
|
+ ret = errno;
|
|
|
|
|
+ goto out;
|
|
|
|
|
}
|
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
f = obj_load(fp, LOADBITS);
|
|
|
|
|
|
|
|
|
|
@@ -4087,7 +4058,7 @@ int insmod_main(int argc, char **argv)
|
|
|
|
|
"\t%s was compiled for kernel version %s\n"
|
|
|
|
|
"\twhile this kernel is version %s",
|
|
|
|
|
flag_force_load ? "warning: " : "",
|
|
|
|
|
- m_filename, m_strversion, uts_info.release);
|
|
|
|
|
+ g_filename, m_strversion, uts_info.release);
|
|
|
|
|
if (!flag_force_load)
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
@@ -4129,7 +4100,7 @@ int insmod_main(int argc, char **argv)
|
|
|
|
|
hide_special_symbols(f);
|
|
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
|
|
|
|
|
- add_ksymoops_symbols(f, m_filename, m_name);
|
|
|
|
|
+ add_ksymoops_symbols(f, g_filename, m_name);
|
|
|
|
|
#endif /* FEATURE_INSMOD_KSYMOOPS_SYMBOLS */
|
|
|
|
|
|
|
|
|
|
new_create_module_ksymtab(f);
|
|
|
|
|
@@ -4138,7 +4109,7 @@ int insmod_main(int argc, char **argv)
|
|
|
|
|
m_size = obj_load_size(f);
|
|
|
|
|
|
|
|
|
|
m_addr = create_module(m_name, m_size);
|
|
|
|
|
- if (m_addr == (ElfW(Addr))(-1)) switch (errno) {
|
|
|
|
|
+ if (m_addr == -1) switch (errno) {
|
|
|
|
|
case EEXIST:
|
|
|
|
|
bb_error_msg_and_die("a module named %s already exists", m_name);
|
|
|
|
|
case ENOMEM:
|
|
|
|
|
@@ -4154,36 +4125,37 @@ int insmod_main(int argc, char **argv)
|
|
|
|
|
* now we can load them directly into the kernel memory
|
|
|
|
|
*/
|
|
|
|
|
if (!obj_load_progbits(fp, f, (char*)m_addr)) {
|
|
|
|
|
- delete_module(m_name, 0);
|
|
|
|
|
+ delete_module(m_name);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (!obj_relocate(f, m_addr)) {
|
|
|
|
|
- delete_module(m_name, 0);
|
|
|
|
|
+ delete_module(m_name);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!new_init_module(m_name, f, m_size)) {
|
|
|
|
|
- delete_module(m_name, 0);
|
|
|
|
|
+ delete_module(m_name);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flag_print_load_map)
|
|
|
|
|
print_load_map(f);
|
|
|
|
|
|
|
|
|
|
- exit_status = EXIT_SUCCESS;
|
|
|
|
|
+ ret = EXIT_SUCCESS;
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
#if ENABLE_FEATURE_CLEAN_UP
|
|
|
|
|
if (fp)
|
|
|
|
|
fclose(fp);
|
|
|
|
|
- free(tmp1);
|
|
|
|
|
- if (!tmp1)
|
|
|
|
|
+ if (tmp)
|
|
|
|
|
+ free(tmp);
|
|
|
|
|
+ else if (m_name)
|
|
|
|
|
free(m_name);
|
|
|
|
|
- free(m_filename);
|
|
|
|
|
+ free(g_filename);
|
|
|
|
|
#endif
|
|
|
|
|
- return exit_status;
|
|
|
|
|
+ return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ENABLE_FEATURE_2_4_MODULES */
|
|
|
|
|
@@ -4195,15 +4167,8 @@ int insmod_main(int argc, char **argv)
|
|
|
|
|
#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
|
|
|
|
|
#include <sys/mman.h>
|
|
|
|
|
-
|
|
|
|
|
-#if defined __UCLIBC__ && !ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
-/* big time suckage. The old prototype above renders our nice fwd-decl wrong */
|
|
|
|
|
-extern int init_module(void *module, unsigned long len, const char *options);
|
|
|
|
|
-#else
|
|
|
|
|
#include <asm/unistd.h>
|
|
|
|
|
#include <sys/syscall.h>
|
|
|
|
|
-#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
|
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
/* We use error numbers in a loose translation... */
|
|
|
|
|
static const char *moderror(int err)
|
|
|
|
|
@@ -4222,22 +4187,32 @@ static const char *moderror(int err)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if !ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
-int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
|
|
-int insmod_main(int argc UNUSED_PARAM, char **argv)
|
|
|
|
|
-#else
|
|
|
|
|
-static int insmod_ng_main(int argc UNUSED_PARAM, char **argv)
|
|
|
|
|
-#endif
|
|
|
|
|
+int insmod_main_26(int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
- size_t len;
|
|
|
|
|
+ char *filename, *options;
|
|
|
|
|
+ struct utsname myuname;
|
|
|
|
|
+ int k_version;
|
|
|
|
|
int optlen;
|
|
|
|
|
+ size_t len;
|
|
|
|
|
void *map;
|
|
|
|
|
- char *filename, *options;
|
|
|
|
|
+ long ret = 0;
|
|
|
|
|
+
|
|
|
|
|
+ /* check the kernel version */
|
|
|
|
|
+ if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
|
|
|
|
|
+ return EINVAL;
|
|
|
|
|
+
|
|
|
|
|
+ k_version = myuname.release[2] - '0';
|
|
|
|
|
+ if (k_version <= 4)
|
|
|
|
|
+ return ENOTSUP;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
filename = *++argv;
|
|
|
|
|
int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
|
|
int insmod_main(int argc UNUSED_PARAM, char **argv)
|
|
|
|
|
@@ -25,9 +118,14 @@ int insmod_main(int argc UNUSED_PARAM, c
|
|
|
|
|
if (!filename)
|
|
|
|
|
bb_show_usage();
|
|
|
|
|
|
|
|
|
|
+ ret = find_module(filename);
|
|
|
|
|
+ if (ret || (g_filename == NULL))
|
|
|
|
|
+ goto done;
|
|
|
|
|
- rc = bb_init_module(filename, parse_cmdline_module_options(argv));
|
|
|
|
|
+ rc = find_module(filename);
|
|
|
|
|
+ if (rc || (g_filename == NULL))
|
|
|
|
|
+ goto done;
|
|
|
|
|
+
|
|
|
|
|
/* Rest is options */
|
|
|
|
|
options = xzalloc(1);
|
|
|
|
|
optlen = 0;
|
|
|
|
|
@@ -4247,41 +4222,47 @@ static int insmod_ng_main(int argc UNUSE
|
|
|
|
|
optlen += sprintf(options + optlen, (strchr(*argv,' ') ? "\"%s\" " : "%s "), *argv);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if 0
|
|
|
|
|
- /* Any special reason why mmap? It isn't performance critical. -vda */
|
|
|
|
|
- /* Yes, xmalloc'ing can use *alot* of RAM. Don't forget that there are
|
|
|
|
|
- * modules out there that are half a megabyte! mmap()ing is way nicer
|
|
|
|
|
- * for small mem boxes, i guess. */
|
|
|
|
|
- /* But after load, these modules will take up that 0.5mb in kernel
|
|
|
|
|
- * anyway. Using malloc here causes only a transient spike to 1mb,
|
|
|
|
|
- * after module is loaded, we go back to normal 0.5mb usage
|
|
|
|
|
- * (in kernel). Also, mmap isn't magic - when we touch mapped data,
|
|
|
|
|
- * we use memory. -vda */
|
|
|
|
|
- int fd;
|
|
|
|
|
- struct stat st;
|
|
|
|
|
- unsigned long len;
|
|
|
|
|
- fd = xopen(filename, O_RDONLY);
|
|
|
|
|
- fstat(fd, &st);
|
|
|
|
|
- len = st.st_size;
|
|
|
|
|
- map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
|
|
|
|
|
- if (map == MAP_FAILED) {
|
|
|
|
|
- bb_perror_msg_and_die("cannot mmap '%s'", filename);
|
|
|
|
|
- }
|
|
|
|
|
+ rc = bb_init_module(g_filename, parse_cmdline_module_options(argv));
|
|
|
|
|
if (rc)
|
|
|
|
|
bb_error_msg("cannot insert '%s': %s", filename, moderror(rc));
|
|
|
|
|
-
|
|
|
|
|
- /* map == NULL on Blackfin, probably on other MMU-less systems too. Workaround. */
|
|
|
|
|
- if (map == NULL) {
|
|
|
|
|
- map = xmalloc(len);
|
|
|
|
|
- xread(fd, map, len);
|
|
|
|
|
- }
|
|
|
|
|
-#else
|
|
|
|
|
len = MAXINT(ssize_t);
|
|
|
|
|
- map = xmalloc_xopen_read_close(filename, &len);
|
|
|
|
|
-#endif
|
|
|
|
|
+ map = xmalloc_open_read_close(g_filename, &len);
|
|
|
|
|
+ ret = syscall(__NR_init_module, map, len, options);
|
|
|
|
|
+ if (ret != 0) {
|
|
|
|
|
+ bb_perror_msg_and_die("cannot insert '%s': %s (%li)",
|
|
|
|
|
+ g_filename, moderror(errno), ret);
|
|
|
|
|
+ }
|
|
|
|
|
+ free (g_filename);
|
|
|
|
|
+done:
|
|
|
|
|
+ if (g_filename && (g_filename != filename))
|
|
|
|
|
+ free(g_filename);
|
|
|
|
|
|
|
|
|
|
- if (init_module(map, len, options) != 0)
|
|
|
|
|
- bb_error_msg_and_die("cannot insert '%s': %s",
|
|
|
|
|
- filename, moderror(errno));
|
|
|
|
|
- return 0;
|
|
|
|
|
+ return ret;
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
+
|
|
|
|
|
+int insmod_main(int argc, char **argv)
|
|
|
|
|
+{
|
|
|
|
|
+ int ret;
|
|
|
|
|
+
|
|
|
|
|
+ g_filename = NULL;
|
|
|
|
|
+#if ENABLE_FEATURE_2_6_MODULES
|
|
|
|
|
+ ret = insmod_main_26(argc, argv);
|
|
|
|
|
+ if (ret != ENOTSUP)
|
|
|
|
|
+ goto done;
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
+#if ENABLE_FEATURE_2_4_MODULES
|
|
|
|
|
+ ret = insmod_main_24(argc, argv);
|
|
|
|
|
+ if (ret != ENOTSUP)
|
|
|
|
|
+ goto done;
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
+ fprintf(stderr, "Error: Kernel version not supported\n");
|
|
|
|
|
+ return 1;
|
|
|
|
|
+
|
|
|
|
|
+done:
|
|
|
|
|
+ if (ret) {
|
|
|
|
|
+ errno = ret;
|
|
|
|
|
+ bb_perror_msg("Loading module failed");
|
|
|
|
|
+ return ret;
|
|
|
|
|
+ } else
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
|
Nicolas Thill
15 years ago