Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/modutils

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/modutils/Config.src (modified) (1 diff)
• mindi-busybox/modutils/depmod.c (modified) (10 diffs)
• mindi-busybox/modutils/insmod.c (modified) (1 diff)
• mindi-busybox/modutils/modinfo.c (modified) (10 diffs)
• mindi-busybox/modutils/modprobe-small.c (modified) (29 diffs)
• mindi-busybox/modutils/modprobe.c (modified) (20 diffs)
• mindi-busybox/modutils/modutils-24.c (modified) (1 diff)
• mindi-busybox/modutils/modutils.c (modified) (3 diffs)
• mindi-busybox/modutils/modutils.h (modified) (1 diff)
• mindi-busybox/modutils/rmmod.c (modified) (3 diffs)

branches/3.3/mindi-busybox/modutils/Config.src

@@ -39 +39 @@
       - depmod generates modules.dep.bb
 
-      As of 2008-07, this code is experimental. It is 14kb smaller
-      than "non-small" modutils.
-
 config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
     bool "Accept module options on modprobe command line"

branches/3.3/mindi-busybox/modutils/depmod.c

@@ -22 +22 @@
  */
 
-typedef struct module_info {
-    struct module_info *next;
-    char *name, *modname;
-    llist_t *dependencies;
-    llist_t *aliases;
-    llist_t *symbols;
-    struct module_info *dnext, *dprev;
-} module_info;
-
 static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
                 void *data, int depth UNUSED_PARAM)
 {
-    char modname[MODULE_NAME_LEN];
-    module_info **first = (module_info **) data;
+    module_db *modules = data;
     char *image, *ptr;
-    module_info *info;
+    module_entry *e;
+
     /* Arbitrary. Was sb->st_size, but that breaks .gz etc */
     size_t len = (64*1024*1024 - 4096);
@@ -45 +36 @@
 
     image = xmalloc_open_zipped_read_close(fname, &len);
-    info = xzalloc(sizeof(*info));
-
-    info->next = *first;
-    *first = info;
-
-    info->dnext = info->dprev = info;
-    info->name = xstrdup(fname + 2); /* skip "./" */
-    info->modname = xstrdup(filename2modname(fname, modname));
+
+    e = moddb_get_or_create(modules, bb_get_last_path_component_nostrip(fname));
+    e->name = xstrdup(fname + 2); /* skip "./" */
+
     for (ptr = image; ptr < image + len - 10; ptr++) {
-        if (strncmp(ptr, "depends=", 8) == 0) {
+        if (is_prefixed_with(ptr, "depends=")) {
             char *u;
 
@@ -61 +48 @@
                 if (*u == '-')
                     *u = '_';
-            ptr += string_to_llist(ptr, &info->dependencies, ",");
+            ptr += string_to_llist(ptr, &e->deps, ",");
         } else if (ENABLE_FEATURE_MODUTILS_ALIAS
-         && strncmp(ptr, "alias=", 6) == 0
+         && is_prefixed_with(ptr, "alias=")
         ) {
-            llist_add_to(&info->aliases, xstrdup(ptr + 6));
+            llist_add_to(&e->aliases, xstrdup(ptr + 6));
             ptr += strlen(ptr);
         } else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
-         && strncmp(ptr, "__ksymtab_", 10) == 0
+         && is_prefixed_with(ptr, "__ksymtab_")
         ) {
             ptr += 10;
-            if (strncmp(ptr, "gpl", 3) == 0
+            if (is_prefixed_with(ptr, "gpl")
              || strcmp(ptr, "strings") == 0
             ) {
                 continue;
             }
-            llist_add_to(&info->symbols, xstrdup(ptr));
+            llist_add_to(&e->symbols, xstrdup(ptr));
             ptr += strlen(ptr);
         }
@@ -85 +72 @@
 }
 
-static module_info *find_module(module_info *modules, const char *modname)
-{
-    module_info *m;
-
-    for (m = modules; m != NULL; m = m->next)
-        if (strcmp(m->modname, modname) == 0)
-            return m;
-    return NULL;
-}
-
-static void order_dep_list(module_info *modules, module_info *start,
-            llist_t *add)
-{
-    module_info *m;
+static void order_dep_list(module_db *modules, module_entry *start, llist_t *add)
+{
+    module_entry *m;
     llist_t *n;
 
     for (n = add; n != NULL; n = n->link) {
-        m = find_module(modules, n->data);
+        m = moddb_get(modules, n->data);
         if (m == NULL)
             continue;
@@ -117 +93 @@
 
         /* recurse */
-        order_dep_list(modules, start, m->dependencies);
+        order_dep_list(modules, start, m->deps);
     }
 }
@@ -183 +159 @@
 int depmod_main(int argc UNUSED_PARAM, char **argv)
 {
-    module_info *modules, *m, *dep;
+    module_db modules;
+    module_entry *m, *dep;
     const char *moddir_base = "/";
     char *moddir, *version;
     struct utsname uts;
+    unsigned i;
     int tmp;
 
@@ -210 +188 @@
 
     /* Scan modules */
-    modules = NULL;
+    memset(&modules, 0, sizeof(modules));
     if (*argv) {
         do {
@@ -223 +201 @@
     if (!(option_mask32 & OPT_n))
         xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
-    for (m = modules; m != NULL; m = m->next) {
+
+    moddb_foreach_module(&modules, m, i) {
         printf("%s:", m->name);
 
-        order_dep_list(modules, m, m->dependencies);
+        order_dep_list(&modules, m, m->deps);
         while (m->dnext != m) {
             dep = m->dnext;
@@ -242 +221 @@
     if (!(option_mask32 & OPT_n))
         xfreopen_write("modules.alias", stdout);
-    for (m = modules; m != NULL; m = m->next) {
-        const char *fname = bb_basename(m->name);
-        int fnlen = strchrnul(fname, '.') - fname;
+    moddb_foreach_module(&modules, m, i) {
         while (m->aliases) {
-            /* Last word can well be m->modname instead,
-             * but depmod from module-init-tools 3.4
-             * uses module basename, i.e., no s/-/_/g.
-             * (pathname and .ko.* are still stripped)
-             * Mimicking that... */
-            printf("alias %s %.*s\n",
+            /*
+             * Last word used to be a basename
+             * (filename with path and .ko.* stripped)
+             * at the time of module-init-tools 3.4.
+             * kmod v.12 uses module name, i.e., s/-/_/g.
+             */
+            printf("alias %s %s\n",
                 (char*)llist_pop(&m->aliases),
-                fnlen, fname);
+                m->modname);
         }
     }
@@ -260 +238 @@
     if (!(option_mask32 & OPT_n))
         xfreopen_write("modules.symbols", stdout);
-    for (m = modules; m != NULL; m = m->next) {
-        const char *fname = bb_basename(m->name);
-        int fnlen = strchrnul(fname, '.') - fname;
+    moddb_foreach_module(&modules, m, i) {
         while (m->symbols) {
-            printf("alias symbol:%s %.*s\n",
+            printf("alias symbol:%s %s\n",
                 (char*)llist_pop(&m->symbols),
-                fnlen, fname);
+                m->modname);
         }
     }
 #endif
 
-    if (ENABLE_FEATURE_CLEAN_UP) {
-        while (modules) {
-            module_info *old = modules;
-            modules = modules->next;
-            free(old->name);
-            free(old->modname);
-            free(old);
-        }
-    }
+    if (ENABLE_FEATURE_CLEAN_UP)
+        moddb_free(&modules);
 
     return EXIT_SUCCESS;

branches/3.3/mindi-busybox/modutils/insmod.c

@@ -22 +22 @@
 //usage:    "[SYMBOL=VALUE]..."
 //usage:#define insmod_full_usage "\n\n"
-//usage:       "Load the specified kernel modules into the kernel"
+//usage:       "Load kernel module"
 //usage:    IF_FEATURE_2_4_MODULES( "\n"
 //usage:     "\n    -f  Force module to load into the wrong kernel version"

branches/3.3/mindi-busybox/modutils/modinfo.c

@@ -6 +6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
-
 //config:config MODINFO
 //config:   bool "modinfo"
@@ -18 +13 @@
 //config:     Show information about a Linux Kernel module
 
+//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
+
 #include <fnmatch.h>
 #include <sys/utsname.h> /* uname() */
@@ -23 +22 @@
 #include "modutils.h"
 
+static const char *const shortcuts[] = {
+    "filename", // -n
+    "author",   // -a
+    "description",  // -d
+    "license",  // -l
+    "parm",     // -p
+    "version",  // the rest has no shortcut options
+    "alias",
+    "srcversion",
+    "depends",
+    "uts_release",
+    "intree",
+    "vermagic",
+    "firmware",
+};
 
 enum {
-    OPT_TAGS = (1 << 12) - 1, /* shortcut count */
-    OPT_F = (1 << 12), /* field name */
-    OPT_0 = (1 << 13), /* \0 as separator */
+    OPT_0 = (1 << 0), /* \0 as separator */
+    OPT_F = (1 << 1), /* field name */
+    /* first bits are for -nadlp options, the rest are for
+     * fields not selectable with "shortcut" options
+     */
+    OPT_n = (1 << 2),
+    OPT_TAGS = ((1 << ARRAY_SIZE(shortcuts)) - 1) << 2,
 };
 
-struct modinfo_env {
-    char *field;
-    int tags;
-};
-
-static int display(const char *data, const char *pattern, int flag)
+static void display(const char *data, const char *pattern)
 {
-    if (flag) {
+    int flag = option_mask32 >> 1; /* shift out -0 bit */
+    if (flag & (flag-1)) {
+        /* more than one field to show: print "FIELD:" pfx */
         int n = printf("%s:", pattern);
         while (n++ < 16)
             bb_putchar(' ');
     }
-    return printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n');
+    printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n');
 }
 
 static void modinfo(const char *path, const char *version,
-            const struct modinfo_env *env)
+            const char *field)
 {
-    static const char *const shortcuts[] = {
-        "filename",
-        "license",
-        "author",
-        "description",
-        "version",
-        "alias",
-        "srcversion",
-        "depends",
-        "uts_release",
-        "vermagic",
-        "parm",
-        "firmware",
-    };
     size_t len;
-    int j, length;
+    int j;
     char *ptr, *the_module;
-    const char *field = env->field;
-    int tags = env->tags;
+    char *allocated;
+    int tags = option_mask32;
 
-    if (tags & 1) { /* filename */
-        display(path, shortcuts[0], 1 != tags);
-    }
-
+    allocated = NULL;
     len = MAXINT(ssize_t);
     the_module = xmalloc_open_zipped_read_close(path, &len);
@@ -78 +76 @@
             return;
         /* Newer depmod puts relative paths in modules.dep */
-        path = xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, version, path);
+        path = allocated = xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, version, path);
         the_module = xmalloc_open_zipped_read_close(path, &len);
-        free((char*)path);
-        if (!the_module)
-            return;
+        if (!the_module) {
+            bb_error_msg("module '%s' not found", path);
+            goto ret;
+        }
     }
 
-    if (field)
-        tags |= OPT_F;
-    for (j = 1; (1<<j) & (OPT_TAGS + OPT_F); j++) {
+    for (j = 1; (1<<j) & (OPT_TAGS|OPT_F); j++) {
         const char *pattern;
 
         if (!((1<<j) & tags))
             continue;
+
         pattern = field;
         if ((1<<j) & OPT_TAGS)
-            pattern = shortcuts[j];
-        length = strlen(pattern);
+            pattern = shortcuts[j-2];
+
+        if (strcmp(pattern, shortcuts[0]) == 0) {
+            /* "-n" or "-F filename" */
+            display(path, shortcuts[0]);
+            continue;
+        }
+
         ptr = the_module;
         while (1) {
+            char *after_pattern;
+
             ptr = memchr(ptr, *pattern, len - (ptr - (char*)the_module));
             if (ptr == NULL) /* no occurance left, done */
                 break;
-            if (strncmp(ptr, pattern, length) == 0 && ptr[length] == '=') {
+            after_pattern = is_prefixed_with(ptr, pattern);
+            if (after_pattern && *after_pattern == '=') {
                 /* field prefixes are 0x80 or 0x00 */
-                if ((ptr[-1] & 0x7F) == '\0') {
-                    ptr += length + 1;
-                    ptr += display(ptr, pattern, (1<<j) != tags);
+                if ((ptr[-1] & 0x7F) == 0x00) {
+                    ptr = after_pattern + 1;
+                    display(ptr, pattern);
+                    ptr += strlen(ptr);
                 }
             }
@@ -112 +120 @@
     }
     free(the_module);
+ ret:
+    free(allocated);
 }
 
 //usage:#define modinfo_trivial_usage
-//usage:       "[-adlp0] [-F keyword] MODULE"
+//usage:       "[-adlpn0] [-F keyword] MODULE"
 //usage:#define modinfo_full_usage "\n\n"
 //usage:       "    -a      Shortcut for '-F author'"
@@ -121 +131 @@
 //usage:     "\n    -l      Shortcut for '-F license'"
 //usage:     "\n    -p      Shortcut for '-F parm'"
+////usage:     "\n  -n      Shortcut for '-F filename'"
 //usage:     "\n    -F keyword  Keyword to look for"
 //usage:     "\n    -0      Separate output with NULs"
@@ -129 +140 @@
 int modinfo_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct modinfo_env env;
+    const char *field;
     char name[MODULE_NAME_LEN];
     struct utsname uts;
@@ -137 +148 @@
     unsigned i;
 
-    env.field = NULL;
+    field = NULL;
     opt_complementary = "-1"; /* minimum one param */
-    opts = getopt32(argv, "nladvAsDumpF:0", &env.field);
-    env.tags = opts & OPT_TAGS ? opts & OPT_TAGS : OPT_TAGS;
+    opts = getopt32(argv, "0F:nadlp", &field);
+    /* If no field selected, show all */
+    if (!(opts & (OPT_TAGS|OPT_F)))
+        option_mask32 |= OPT_TAGS;
     argv += optind;
 
@@ -154 +167 @@
             continue;
         *colon = '\0';
-        filename2modname(tokens[0], name);
+        filename2modname(bb_basename(tokens[0]), name);
         for (i = 0; argv[i]; i++) {
             if (fnmatch(argv[i], name, 0) == 0) {
-                modinfo(tokens[0], uts.release, &env);
+                modinfo(tokens[0], uts.release, field);
                 argv[i] = (char *) "";
             }
@@ -167 +180 @@
     for (i = 0; argv[i]; i++) {
         if (argv[i][0]) {
-            modinfo(argv[i], uts.release, &env);
+            modinfo(argv[i], uts.release, field);
         }
     }

branches/3.3/mindi-busybox/modutils/modprobe-small.c

@@ -10 +10 @@
 
 //applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))
 
 #include "libbb.h"
@@ -22 +22 @@
 extern int init_module(void *module, unsigned long len, const char *options);
 extern int delete_module(const char *module, unsigned flags);
-extern int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret);
+/* linux/include/linux/module.h has limit of 64 chars on module names */
+#undef MODULE_NAME_LEN
+#define MODULE_NAME_LEN 64
 
 
@@ -44 +46 @@
     char *aliases;
     char *deps;
+    smallint open_read_failed;
 } module_info;
 
@@ -114 +117 @@
 static char* find_keyword(char *ptr, size_t len, const char *word)
 {
-    int wlen;
-
     if (!ptr) /* happens if xmalloc_open_zipped_read_close cannot read it */
         return NULL;
 
-    wlen = strlen(word);
-    len -= wlen - 1;
+    len -= strlen(word) - 1;
     while ((ssize_t)len > 0) {
         char *old = ptr;
+        char *after_word;
+
         /* search for the first char in word */
-        ptr = memchr(ptr, *word, len);
+        ptr = memchr(ptr, word[0], len);
         if (ptr == NULL) /* no occurance left, done */
             break;
-        if (strncmp(ptr, word, wlen) == 0)
-            return ptr + wlen; /* found, return ptr past it */
+        after_word = is_prefixed_with(ptr, word);
+        if (after_word)
+            return after_word; /* found, return ptr past it */
         ++ptr;
         len -= (ptr - old);
@@ -142 +145 @@
         ++s;
     }
+}
+
+static char *filename2modname(const char *filename, char *modname)
+{
+    int i;
+    const char *from;
+
+    // Disabled since otherwise "modprobe dir/name" would work
+    // as if it is "modprobe name". It is unclear why
+    // 'basenamization' was here in the first place.
+    //from = bb_get_last_path_component_nostrip(filename);
+    from = filename;
+    for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
+        modname[i] = (from[i] == '-') ? '_' : from[i];
+    modname[i] = '\0';
+
+    return modname;
+}
+
+static int pathname_matches_modname(const char *pathname, const char *modname)
+{
+    int r;
+    char name[MODULE_NAME_LEN];
+    filename2modname(bb_get_last_path_component_nostrip(pathname), name);
+    r = (strcmp(name, modname) == 0);
+    return r;
 }
 
@@ -195 +224 @@
 }
 
-static void parse_module(module_info *info, const char *pathname)
+/* Returns !0 if open/read was unsuccessful */
+static int parse_module(module_info *info, const char *pathname)
 {
     char *module_image;
@@ -204 +234 @@
 
     /* Read (possibly compressed) module */
+    errno = 0;
     len = 64 * 1024 * 1024; /* 64 Mb at most */
     module_image = xmalloc_open_zipped_read_close(pathname, &len);
@@ -213 +244 @@
     pos = 0;
     while (1) {
+        unsigned start = stringbuf_idx;
         ptr = find_keyword(module_image + pos, len - pos, "alias=");
         if (!ptr) {
@@ -229 +261 @@
         append(ptr);
         appendc(' ');
+        /*
+         * Don't add redundant aliases, such as:
+         * libcrc32c.ko symbol:crc32c symbol:crc32c
+         */
+        if (start) { /* "if we aren't the first alias" */
+            char *found, *last;
+            stringbuf[stringbuf_idx] = '\0';
+            last = stringbuf + start;
+            /*
+             * String at last-1 is " symbol:crc32c "
+             * (with both leading and trailing spaces).
+             */
+            if (strncmp(stringbuf, last, stringbuf_idx - start) == 0)
+                /* First alias matches us */
+                found = stringbuf;
+            else
+                /* Does any other alias match? */
+                found = strstr(stringbuf, last-1);
+            if (found < last-1) {
+                /* There is absolutely the same string before us */
+                dbg2_error_msg("redundant:'%s'", last);
+                stringbuf_idx = start;
+                goto skip;
+            }
+        }
  skip:
         pos = (ptr - module_image);
@@ -245 +302 @@
         append(ptr);
     }
+    free(module_image);
     info->deps = copy_stringbuf();
 
-    free(module_image);
-}
-
-static int pathname_matches_modname(const char *pathname, const char *modname)
-{
-    const char *fname = bb_get_last_path_component_nostrip(pathname);
-    const char *suffix = strrstr(fname, ".ko");
-//TODO: can do without malloc?
-    char *name = xstrndup(fname, suffix - fname);
-    int r;
-    replace(name, '-', '_');
-    r = (strcmp(name, modname) == 0);
-    free(name);
-    return r;
+    info->open_read_failed = (module_image == NULL);
+    return info->open_read_failed;
 }
 
@@ -291 +337 @@
     dbg1_error_msg("'%s' module name matches", pathname);
     module_found_idx = cur;
-    parse_module(&modinfo[cur], pathname);
+    if (parse_module(&modinfo[cur], pathname) != 0)
+        return TRUE; /* failed to open/read it, no point in trying loading */
 
     if (!(option_mask32 & OPT_r)) {
@@ -422 +469 @@
 }
 
-static module_info* find_alias(const char *alias)
+static module_info** find_alias(const char *alias)
 {
     int i;
     int dep_bb_fd;
-    module_info *result;
+    int infoidx;
+    module_info **infovec;
     dbg1_error_msg("find_alias('%s')", alias);
 
@@ -439 +487 @@
                 parse_module(&modinfo[i], modinfo[i].pathname);
             }
-            return &modinfo[i];
+            infovec = xzalloc(2 * sizeof(infovec[0]));
+            infovec[0] = &modinfo[i];
+            return infovec;
         }
         i++;
@@ -452 +502 @@
     /* Scan all module bodies, extract modinfo (it contains aliases) */
     i = 0;
-    result = NULL;
+    infoidx = 0;
+    infovec = NULL;
     while (modinfo[i].pathname) {
         char *desc, *s;
         if (!modinfo[i].aliases) {
             parse_module(&modinfo[i], modinfo[i].pathname);
-        }
-        if (result) {
-            i++;
-            continue;
         }
         /* "alias1 symbol:sym1 alias2 symbol:sym2" */
@@ -473 +520 @@
                 dbg1_error_msg("found alias '%s' in module '%s'",
                         alias, modinfo[i].pathname);
-                result = &modinfo[i];
+                infovec = xrealloc_vector(infovec, 1, infoidx);
+                infovec[infoidx++] = &modinfo[i];
                 break;
             }
         }
         free(desc);
-        if (result && dep_bb_fd < 0)
-            return result;
         i++;
     }
@@ -488 +534 @@
     }
 
-    dbg1_error_msg("find_alias '%s' returns %p", alias, result);
-    return result;
+    dbg1_error_msg("find_alias '%s' returns %d results", alias, infoidx);
+    return infovec;
 }
 
@@ -496 +542 @@
 static int already_loaded(const char *name)
 {
-    int ret = 0;
-    char *s;
-    parser_t *parser = config_open2("/proc/modules", xfopen_for_read);
-    while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
-        if (strcmp(s, name) == 0) {
-            ret = 1;
-            break;
-        }
-    }
-    config_close(parser);
-    return ret;
+    int ret;
+    char *line;
+    FILE *fp;
+
+    ret = 5 * 2;
+ again:
+    fp = fopen_for_read("/proc/modules");
+    if (!fp)
+        return 0;
+    while ((line = xmalloc_fgetline(fp)) != NULL) {
+        char *live;
+        char *after_name;
+
+        // Examples from kernel 3.14.6:
+        //pcspkr 12718 0 - Live 0xffffffffa017e000
+        //snd_timer 28690 2 snd_seq,snd_pcm, Live 0xffffffffa025e000
+        //i915 801405 2 - Live 0xffffffffa0096000
+        after_name = is_prefixed_with(line, name);
+        if (!after_name || *after_name != ' ') {
+            free(line);
+            continue;
+        }
+        live = strstr(line, " Live");
+        free(line);
+        if (!live) {
+            /* State can be Unloading, Loading, or Live.
+             * modprobe must not return prematurely if we see "Loading":
+             * it can cause further programs to assume load completed,
+             * but it did not (yet)!
+             * Wait up to 5*20 ms for it to resolve.
+             */
+            ret -= 2;
+            if (ret == 0)
+                break;  /* huh? report as "not loaded" */
+            fclose(fp);
+            usleep(20*1000);
+            goto again;
+        }
+        ret = 1;
+        break;
+    }
+    fclose(fp);
+
+    return ret & 1;
 }
 #else
-#define already_loaded(name) is_rmmod
+#define already_loaded(name) 0
 #endif
+
+static int rmmod(const char *filename)
+{
+    int r;
+    char modname[MODULE_NAME_LEN];
+
+    filename2modname(filename, modname);
+    r = delete_module(modname, O_NONBLOCK | O_EXCL);
+    dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
+    if (r != 0 && !(option_mask32 & OPT_q)) {
+        bb_perror_msg("remove '%s'", modname);
+    }
+    return r;
+}
 
 /*
@@ -522 +615 @@
 #define cmdline_options ""
 #endif
-static void process_module(char *name, const char *cmdline_options)
+static int process_module(char *name, const char *cmdline_options)
 {
     char *s, *deps, *options;
+    module_info **infovec;
     module_info *info;
-    int is_rmmod = (option_mask32 & OPT_r) != 0;
+    int infoidx;
+    int is_remove = (option_mask32 & OPT_r) != 0;
+    int exitcode = EXIT_SUCCESS;
+
     dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
 
     replace(name, '-', '_');
 
-    dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod);
-    if (already_loaded(name) != is_rmmod) {
+    dbg1_error_msg("already_loaded:%d is_remove:%d", already_loaded(name), is_remove);
+
+    if (applet_name[0] == 'r') {
+        /* rmmod.
+         * Does not remove dependencies, no need to scan, just remove.
+         * (compat note: this allows and strips .ko suffix)
+         */
+        rmmod(name);
+        return EXIT_SUCCESS;
+    }
+
+    /*
+     * We used to have "is_remove != already_loaded(name)" check here, but
+     *  modprobe -r pci:v00008086d00007010sv00000000sd00000000bc01sc01i80
+     * won't unload modules (there are more than one)
+     * which have this alias.
+     */
+    if (!is_remove && already_loaded(name)) {
         dbg1_error_msg("nothing to do for '%s'", name);
-        return;
+        return EXIT_SUCCESS;
     }
 
     options = NULL;
-    if (!is_rmmod) {
+    if (!is_remove) {
         char *opt_filename = xasprintf("/etc/modules/%s", name);
         options = xmalloc_open_read_close(opt_filename, NULL);
@@ -561 +674 @@
         /* Scan module directory. This is done only once.
          * It will attempt module load, and will exit(EXIT_SUCCESS)
-         * on success. */
+         * on success.
+         */
         module_found_idx = -1;
         recursive_action(".",
@@ -568 +682 @@
             NULL, /* dir action */
             name, /* user data */
-            0); /* depth */
+            0 /* depth */
+        );
         dbg1_error_msg("dirscan complete");
-        /* Module was not found, or load failed, or is_rmmod */
+        /* Module was not found, or load failed, or is_remove */
         if (module_found_idx >= 0) { /* module was found */
-            info = &modinfo[module_found_idx];
+            infovec = xzalloc(2 * sizeof(infovec[0]));
+            infovec[0] = &modinfo[module_found_idx];
         } else { /* search for alias, not a plain module name */
-            info = find_alias(name);
+            infovec = find_alias(name);
         }
     } else {
-        info = find_alias(name);
-    }
-
-// Problem here: there can be more than one module
-// for the given alias. For example,
-// "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
-// ata_piix because it has an alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
-// and ata_generic, it has an alias "alias=pci:v*d*sv*sd*bc01sc01i*"
-// Standard modprobe would load them both.
-// In this code, find_alias() returns only the first matching module.
-
-    /* rmmod? unload it by name */
-    if (is_rmmod) {
-        if (delete_module(name, O_NONBLOCK | O_EXCL) != 0) {
-            if (!(option_mask32 & OPT_q))
-                bb_perror_msg("remove '%s'", name);
-            goto ret;
-        }
-
-        if (applet_name[0] == 'r') {
-            /* rmmod: do not remove dependencies, exit */
-            goto ret;
-        }
-
+        infovec = find_alias(name);
+    }
+
+    if (!infovec) {
+        /* both dirscan and find_alias found nothing */
+        if (!is_remove && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
+            bb_error_msg("module '%s' not found", name);
+//TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
+        goto ret;
+    }
+
+    /* There can be more than one module for the given alias. For example,
+     * "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
+     * ata_piix because it has alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
+     * and ata_generic, it has alias "pci:v*d*sv*sd*bc01sc01i*"
+     * Standard modprobe loads them both. We achieve it by returning
+     * a *list* of modinfo pointers from find_alias().
+     */
+
+    /* modprobe -r? unload module(s) */
+    if (is_remove) {
+        infoidx = 0;
+        while ((info = infovec[infoidx++]) != NULL) {
+            int r = rmmod(bb_get_last_path_component_nostrip(info->pathname));
+            if (r != 0) {
+                goto ret; /* error */
+            }
+        }
         /* modprobe -r: we do not stop here -
          * continue to unload modules on which the module depends:
@@ -609 +729 @@
     }
 
-    if (!info) {
-        /* both dirscan and find_alias found nothing */
-        if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
-            bb_error_msg("module '%s' not found", name);
-//TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
-        goto ret;
-    }
-
-    /* Iterate thru dependencies, trying to (un)load them */
-    deps = str_2_list(info->deps);
-    for (s = deps; *s; s += strlen(s) + 1) {
-        //if (strcmp(name, s) != 0) // N.B. do loops exist?
-        dbg1_error_msg("recurse on dep '%s'", s);
-        process_module(s, NULL);
-        dbg1_error_msg("recurse on dep '%s' done", s);
-    }
-    free(deps);
-
-    /* modprobe -> load it */
-    if (!is_rmmod) {
-        if (!options || strstr(options, "blacklist") == NULL) {
-            errno = 0;
-            if (load_module(info->pathname, options) != 0) {
-                if (EEXIST != errno) {
-                    bb_error_msg("'%s': %s",
-                        info->pathname,
-                        moderror(errno));
-                } else {
-                    dbg1_error_msg("'%s': %s",
-                        info->pathname,
-                        moderror(errno));
-                }
+    infoidx = 0;
+    while ((info = infovec[infoidx++]) != NULL) {
+        /* Iterate thru dependencies, trying to (un)load them */
+        deps = str_2_list(info->deps);
+        for (s = deps; *s; s += strlen(s) + 1) {
+            //if (strcmp(name, s) != 0) // N.B. do loops exist?
+            dbg1_error_msg("recurse on dep '%s'", s);
+            process_module(s, NULL);
+            dbg1_error_msg("recurse on dep '%s' done", s);
+        }
+        free(deps);
+
+        if (is_remove)
+            continue;
+
+        /* We are modprobe: load it */
+        if (options && strstr(options, "blacklist")) {
+            dbg1_error_msg("'%s': blacklisted", info->pathname);
+            continue;
+        }
+        if (info->open_read_failed) {
+            /* We already tried it, didn't work. Don't try load again */
+            exitcode = EXIT_FAILURE;
+            continue;
+        }
+        errno = 0;
+        if (load_module(info->pathname, options) != 0) {
+            if (EEXIST != errno) {
+                bb_error_msg("'%s': %s",
+                    info->pathname,
+                    moderror(errno));
+            } else {
+                dbg1_error_msg("'%s': %s",
+                    info->pathname,
+                    moderror(errno));
             }
-        } else {
-            dbg1_error_msg("'%s': blacklisted", info->pathname);
+            exitcode = EXIT_FAILURE;
         }
     }
  ret:
+    free(infovec);
     free(options);
-//TODO: return load attempt result from process_module.
-//If dep didn't load ok, continuing makes little sense.
+
+    return exitcode;
 }
 #undef cmdline_options
@@ -704 +827 @@
 //usage:#if ENABLE_MODPROBE_SMALL
 
-//// Note: currently, help system shows modprobe --help text for all aliased cmds
-//// (see APPLET_ODDNAME macro definition).
-//// All other help texts defined below are not used. FIXME?
-
 //usage:#define depmod_trivial_usage NOUSAGE_STR
 //usage:#define depmod_full_usage ""
@@ -721 +840 @@
 //usage:    "[SYMBOL=VALUE]..."
 //usage:#define insmod_full_usage "\n\n"
-//usage:       "Load the specified kernel modules into the kernel"
+//usage:       "Load kernel module"
 //usage:    IF_FEATURE_2_4_MODULES( "\n"
 //usage:     "\n    -f  Force module to load into the wrong kernel version"
@@ -746 +865 @@
 
 //usage:#define modprobe_trivial_usage
-//usage:    "[-qfwrsv] MODULE [symbol=value]..."
+//usage:    "[-qfwrsv] MODULE [SYMBOL=VALUE]..."
 //usage:#define modprobe_full_usage "\n\n"
 //usage:       "    -r  Remove MODULE (stacks) or do autoclean"
@@ -760 +879 @@
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
+    int exitcode;
     struct utsname uts;
     char applet0 = applet_name[0];
@@ -831 +951 @@
 
 #if ENABLE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
-    /* If not rmmod, parse possible module options given on command line.
+    /* If not rmmod/-r, parse possible module options given on command line.
      * insmod/modprobe takes one module name, the rest are parameters. */
     options = NULL;
-    if ('r' != applet0) {
+    if (!(option_mask32 & OPT_r)) {
         char **arg = argv;
         while (*++arg) {
@@ -845 +965 @@
     }
 #else
-    if ('r' != applet0)
+    if (!(option_mask32 & OPT_r))
         argv[1] = NULL;
 #endif
@@ -865 +985 @@
                     *argv, moderror(errno));
         }
-        return 0;
+        return EXIT_SUCCESS;
     }
 
     /* Try to load modprobe.dep.bb */
-    load_dep_bb();
+    if ('r' != applet0) { /* not rmmod */
+        load_dep_bb();
+    }
 
     /* Load/remove modules.
-     * Only rmmod loops here, modprobe has only argv[0] */
+     * Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */
+    exitcode = EXIT_SUCCESS;
     do {
-        process_module(*argv, options);
+        exitcode |= process_module(*argv, options);
     } while (*++argv);
 
@@ -880 +1003 @@
         IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
     }
-    return EXIT_SUCCESS;
-}
+    return exitcode;
+}

branches/3.3/mindi-busybox/modutils/modprobe.c

@@ -16 +16 @@
 #include <fnmatch.h>
 
-//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#if 1
 #define DBG(...) ((void)0)
+#else
+#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#endif
 
 /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
@@ -88 +91 @@
 //usage:#define modprobe_trivial_usage
 //usage:    "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
-//usage:    " MODULE [symbol=value]..."
+//usage:    " MODULE [SYMBOL=VALUE]..."
 //usage:#define modprobe_full_usage "\n\n"
 //usage:       "    -a  Load multiple MODULEs"
@@ -148 +151 @@
 #define MODULE_FLAG_BLACKLISTED         0x0008
 
-struct module_entry { /* I'll call it ME. */
-    unsigned flags;
-    char *modname; /* stripped of /path/, .ext and s/-/_/g */
-    const char *probed_name; /* verbatim as seen on cmdline */
-    char *options; /* options from config files */
-    llist_t *realnames; /* strings. if this module is an alias, */
-    /* real module name is one of these. */
-//Can there really be more than one? Example from real kernel?
-    llist_t *deps; /* strings. modules we depend on */
-};
-
-#define DB_HASH_SIZE 256
-
 struct globals {
     llist_t *probes; /* MEs of module(s) requested on cmdline */
@@ -168 +158 @@
     smallint need_symbols;
     struct utsname uts;
-    llist_t *db[DB_HASH_SIZE]; /* MEs of all modules ever seen (caching for speed) */
+    module_db db;
 } FIX_ALIASING;
 #define G (*ptr_to_globals)
 #define INIT_G() do { \
-        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
@@ -193 +183 @@
 }
 
-/* These three functions called many times, optimizing for speed.
- * Users reported minute-long delays when they runn iptables repeatedly
- * (iptables use modprobe to install needed kernel modules).
- */
-static struct module_entry *helper_get_module(const char *module, int create)
-{
-    char modname[MODULE_NAME_LEN];
-    struct module_entry *e;
-    llist_t *l;
-    unsigned i;
-    unsigned hash;
-
-    filename2modname(module, modname);
-
-    hash = 0;
-    for (i = 0; modname[i]; i++)
-        hash = ((hash << 5) + hash) + modname[i];
-    hash %= DB_HASH_SIZE;
-
-    for (l = G.db[hash]; l; l = l->link) {
-        e = (struct module_entry *) l->data;
-        if (strcmp(e->modname, modname) == 0)
-            return e;
-    }
-    if (!create)
-        return NULL;
-
-    e = xzalloc(sizeof(*e));
-    e->modname = xstrdup(modname);
-    llist_add_to(&G.db[hash], e);
-
-    return e;
-}
-static ALWAYS_INLINE struct module_entry *get_or_add_modentry(const char *module)
-{
-    return helper_get_module(module, 1);
-}
-static ALWAYS_INLINE struct module_entry *get_modentry(const char *module)
-{
-    return helper_get_module(module, 0);
+static struct module_entry *get_or_add_modentry(const char *module)
+{
+    return moddb_get_or_create(&G.db, module);
 }
 
@@ -253 +206 @@
     G.num_unresolved_deps++;
     if (ENABLE_FEATURE_MODUTILS_SYMBOLS
-     && strncmp(m->modname, "symbol:", 7) == 0
+     && is_prefixed_with(m->modname, "symbol:")
     ) {
         G.need_symbols = 1;
@@ -262 +215 @@
                     struct stat *statbuf UNUSED_PARAM,
                     void *userdata UNUSED_PARAM,
-                    int depth UNUSED_PARAM)
+                    int depth)
 {
     char *tokens[3];
@@ -268 +221 @@
     struct module_entry *m;
     int rc = TRUE;
-
-    if (bb_basename(filename)[0] == '.')
+    const char *base, *ext;
+
+    /* Skip files that begin with a "." */
+    base = bb_basename(filename);
+    if (base[0] == '.')
         goto error;
+
+    /* In dir recursion, skip files that do not end with a ".conf"
+     * depth==0: read_config("modules.{symbols,alias}") must work,
+     * "include FILE_NOT_ENDING_IN_CONF" must work too.
+     */
+    if (depth != 0) {
+        ext = strrchr(base, '.');
+        if (ext == NULL || strcmp(ext + 1, "conf"))
+            goto error;
+    }
 
     p = config_open2(filename, fopen_for_read);
@@ -315 +281 @@
             m->options = gather_options_str(m->options, tokens[2]);
         } else if (strcmp(tokens[0], "include") == 0) {
-            /* include <filename> */
+            /* include <filename>/<dirname> (yes, directories also must work) */
             read_config(tokens[1]);
         } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST
@@ -332 +298 @@
 {
     return recursive_action(path, ACTION_RECURSE | ACTION_QUIET,
-                config_file_action, NULL, NULL, 1);
+                config_file_action, NULL, NULL,
+                /*depth:*/ 0);
 }
 
@@ -339 +306 @@
     /* probed_name may be NULL. modname always exists. */
     return m->probed_name ? m->probed_name : m->modname;
+}
+
+/* Like strsep(&stringp, "\n\t ") but quoted text goes to single token
+ * even if it contains whitespace.
+ */
+static char *strsep_quotes(char **stringp)
+{
+    char *s, *start = *stringp;
+
+    if (!start)
+        return NULL;
+
+    for (s = start; ; s++) {
+        switch (*s) {
+        case '"':
+            s = strchrnul(s + 1, '"'); /* find trailing quote */
+            if (*s != '\0')
+                s++; /* skip trailing quote */
+            /* fall through */
+        case '\0':
+        case '\n':
+        case '\t':
+        case ' ':
+            if (*s != '\0') {
+                *s = '\0';
+                *stringp = s + 1;
+            } else {
+                *stringp = NULL;
+            }
+            return start;
+        }
+    }
 }
 
@@ -346 +345 @@
     char *kcmdline;
     char *kptr;
-    int len;
 
     kcmdline_buf = xmalloc_open_read_close("/proc/cmdline", NULL);
@@ -353 +351 @@
 
     kcmdline = kcmdline_buf;
-    len = strlen(modulename);
-    while ((kptr = strsep(&kcmdline, "\n\t ")) != NULL) {
-        if (strncmp(modulename, kptr, len) != 0)
-            continue;
-        kptr += len;
-        if (*kptr != '.')
+    while ((kptr = strsep_quotes(&kcmdline)) != NULL) {
+        char *after_modulename = is_prefixed_with(kptr, modulename);
+        if (!after_modulename || *after_modulename != '.')
             continue;
         /* It is "modulename.xxxx" */
-        kptr++;
+        kptr = after_modulename + 1;
         if (strchr(kptr, '=') != NULL) {
             /* It is "modulename.opt=[val]" */
@@ -418 +413 @@
         rc = 0;
         fn = llist_pop(&m->deps); /* we leak it */
-        m2 = get_or_add_modentry(fn);
+        m2 = get_or_add_modentry(bb_get_last_path_component_nostrip(fn));
 
         if (option_mask32 & OPT_REMOVE) {
@@ -426 +421 @@
                 if (rc) {
                     if (first) {
-                        bb_error_msg("can't unload module %s: %s",
-                            humanly_readable_name(m2),
-                            moderror(rc));
+                        bb_perror_msg("can't unload module '%s'",
+                            humanly_readable_name(m2));
                         break;
                     }
@@ -500 +494 @@
         if (colon == NULL)
             continue;
-        *colon = 0;
-
-        m = get_modentry(tokens[0]);
+        *colon = '\0';
+
+        m = moddb_get(&G.db, bb_get_last_path_component_nostrip(tokens[0]));
         if (m == NULL)
             continue;
@@ -547 +541 @@
     if (opt & OPT_LIST_ONLY) {
         int i;
-        char name[MODULE_NAME_LEN];
         char *colon, *tokens[2];
         parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
@@ -559 +552 @@
                 continue;
             *colon = '\0';
-            filename2modname(tokens[0], name);
             if (!argv[0])
                 puts(tokens[0]);
             else {
+                char name[MODULE_NAME_LEN];
+                filename2modname(
+                    bb_get_last_path_component_nostrip(tokens[0]),
+                    name
+                );
                 for (i = 0; argv[i]; i++) {
                     if (fnmatch(argv[i], name, 0) == 0) {
@@ -584 +581 @@
              */
             if (bb_delete_module(NULL, O_NONBLOCK | O_EXCL) != 0)
-                bb_perror_msg_and_die("rmmod");
+                bb_perror_nomsg_and_die();
         }
         return EXIT_SUCCESS;
@@ -660 +657 @@
     }
 
+    if (ENABLE_FEATURE_CLEAN_UP)
+        moddb_free(&G.db);
+
     return (rc != 0);
 }

branches/3.3/mindi-busybox/modutils/modutils-24.c

@@ -2256 +2256 @@
          * their references.
          */
-        if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
+        if (is_prefixed_with((char *)s->name, "GPLONLY_")) {
 #if ENABLE_FEATURE_CHECK_TAINTED_MODULE
             if (gpl)

branches/3.3/mindi-busybox/modutils/modutils.c

@@ -17 +17 @@
 #endif
 
+static module_entry *helper_get_module(module_db *db, const char *module, int create)
+{
+    char modname[MODULE_NAME_LEN];
+    struct module_entry *e;
+    unsigned i, hash;
+
+    filename2modname(module, modname);
+
+    hash = 0;
+    for (i = 0; modname[i]; i++)
+        hash = ((hash << 5) + hash) + modname[i];
+    hash %= MODULE_HASH_SIZE;
+
+    for (e = db->buckets[hash]; e; e = e->next)
+        if (strcmp(e->modname, modname) == 0)
+            return e;
+    if (!create)
+        return NULL;
+
+    e = xzalloc(sizeof(*e));
+    e->modname = xstrdup(modname);
+    e->next = db->buckets[hash];
+    db->buckets[hash] = e;
+    IF_DEPMOD(e->dnext = e->dprev = e;)
+
+    return e;
+}
+module_entry* FAST_FUNC moddb_get(module_db *db, const char *module)
+{
+    return helper_get_module(db, module, 0);
+}
+module_entry* FAST_FUNC moddb_get_or_create(module_db *db, const char *module)
+{
+    return helper_get_module(db, module, 1);
+}
+
+void FAST_FUNC moddb_free(module_db *db)
+{
+    module_entry *e, *n;
+    unsigned i;
+
+    for (i = 0; i < MODULE_HASH_SIZE; i++) {
+        for (e = db->buckets[i]; e; e = n) {
+            n = e->next;
+            free(e->name);
+            free(e->modname);
+            free(e);
+        }
+    }
+}
+
 void FAST_FUNC replace(char *s, char what, char with)
 {
@@ -48 +99 @@
 char* FAST_FUNC filename2modname(const char *filename, char *modname)
 {
+    char local_modname[MODULE_NAME_LEN];
     int i;
-    char *from;
+    const char *from;
 
     if (filename == NULL)
         return NULL;
     if (modname == NULL)
-        modname = xmalloc(MODULE_NAME_LEN);
-    from = bb_get_last_path_component_nostrip(filename);
+        modname = local_modname;
+    // Disabled since otherwise "modprobe dir/name" would work
+    // as if it is "modprobe name". It is unclear why
+    // 'basenamization' was here in the first place.
+    //from = bb_get_last_path_component_nostrip(filename);
+    from = filename;
     for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
         modname[i] = (from[i] == '-') ? '_' : from[i];
     modname[i] = '\0';
+
+    if (modname == local_modname)
+        return xstrdup(modname);
 
     return modname;
@@ -183 +242 @@
 }
 
+/* Note: not suitable for delete_module() errnos.
+ * For them, probably only EWOULDBLOCK needs explaining:
+ * "Other modules depend on us". So far we don't do such
+ * translation and don't use moderror() for removal errors.
+ */
 const char* FAST_FUNC moderror(int err)
 {

branches/3.3/mindi-busybox/modutils/modutils.h

@@ -17 +17 @@
  * internally for the maximum alias name length, which can be quite long */
 #define MODULE_NAME_LEN 256
+#define MODULE_HASH_SIZE 256
+
+typedef struct module_entry {
+    struct module_entry *next;
+    char *name, *modname;
+    llist_t *deps;
+    IF_MODPROBE(
+        llist_t *realnames;
+        unsigned flags;
+        const char *probed_name; /* verbatim as seen on cmdline */
+        char *options; /* options from config files */
+    )
+    IF_DEPMOD(
+        llist_t *aliases;
+        llist_t *symbols;
+        struct module_entry *dnext, *dprev;
+    )
+} module_entry;
+
+typedef struct module_db {
+    module_entry *buckets[MODULE_HASH_SIZE];
+} module_db;
+
+#define moddb_foreach_module(db, module, index) \
+    for ((index) = 0; (index) < MODULE_HASH_SIZE; (index)++) \
+        for (module = (db)->buckets[index]; module; module = module->next)
+
+module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC;
+module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC;
+void moddb_free(module_db *db) FAST_FUNC;
 
 void replace(char *s, char what, char with) FAST_FUNC;

branches/3.3/mindi-busybox/modutils/rmmod.c

@@ -29 +29 @@
 int rmmod_main(int argc UNUSED_PARAM, char **argv)
 {
-    int n;
+    int n, err;
     unsigned flags = O_NONBLOCK | O_EXCL;
 
@@ -41 +41 @@
     if (n & 4) {
         /* Unload _all_ unused modules via NULL delete_module() call */
-        if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT)
+        err = bb_delete_module(NULL, flags);
+        if (err && err != EFAULT)
             bb_perror_msg_and_die("rmmod");
         return EXIT_SUCCESS;
@@ -59 +60 @@
         else
             filename2modname(bname, modname);
-        if (bb_delete_module(modname, flags))
-            bb_error_msg_and_die("can't unload '%s': %s",
-                    modname, moderror(errno));
+        err = bb_delete_module(modname, flags);
+        if (err)
+            bb_perror_msg_and_die("can't unload module '%s'",
+                    modname);
     }