Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/modutils/modprobe-small.c

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/modprobe-small.c (modified) (29 diffs)

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;
+}