5 files changed, 26 insertions, 7 deletions

diff --git a/modutils/insmod.c b/modutils/insmod.c
index bd79a0f26..8f7163e25 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -26,7 +26,7 @@
 
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define insmod_trivial_usage
-//usage:        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE")
+//usage:        IF_FEATURE_2_4_MODULES("[-fkvqLx] MODULE")
 //usage:        IF_NOT_FEATURE_2_4_MODULES("FILE")
 //usage:        IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
 //usage:#define insmod_full_usage "\n\n"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index c5cdc7980..d15772f0d 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -20,7 +20,7 @@
 #include "libbb.h"
 #include "modutils.h"
 
-static const char *const shortcuts[] = {
+static const char *const shortcuts[] ALIGN_PTR = {
         "filename",     // -n
         "author",       // -a
         "description",  // -d
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 18cfac481..db44a2ed0 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -377,11 +377,11 @@ static int parse_module(module_info *info, const char *pathname)
         return info->open_read_failed;
 }
 
-static FAST_FUNC int fileAction(const char *pathname,
-                struct stat *sb UNUSED_PARAM,
-                void *modname_to_match,
-                int depth UNUSED_PARAM)
+static FAST_FUNC int fileAction(struct recursive_state *state,
+                const char *pathname,
+                struct stat *sb UNUSED_PARAM)
 {
+        const char *modname_to_match = state->userData;
         int cur;
         const char *fname;
         bool is_remove = (ENABLE_RMMOD && ONLY_APPLET)
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index eeeff7609..c334186b8 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -663,6 +663,25 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 load_modules_dep();
         }
 
+        /* Handle modprobe.blacklist=module1,module2,... */
+        if (ENABLE_FEATURE_MODPROBE_BLACKLIST) {
+                char *options;
+                char *substr;
+
+                options = parse_and_add_kcmdline_module_options(NULL, "modprobe");
+                while ((substr = strsep(&options, " ")) != NULL) {
+                        char *fn = is_prefixed_with(substr, "blacklist=");
+                        if (!fn)
+                                continue;
+                        while ((substr = strsep(&fn, ",")) != NULL) {
+                                /* blacklist <modulename> */
+                                get_or_add_modentry(substr)->flags |= MODULE_FLAG_BLACKLISTED;
+                                DBG("blacklist: %s", substr);
+                        }
+                }
+                /*free(options); - WRONG, strsep may have advanced it */
+        }
+
         rc = 0;
         while ((me = llist_pop(&G.probes)) != NULL) {
                 if (me->realnames == NULL) {
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 6f7cd9721..f7ad5e805 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -169,7 +169,7 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
         /* st.st_size is off_t, we can't just pass it to mmap */
         if (st.st_size <= *image_size_p) {
                 size_t image_size = st.st_size;
-                image = mmap(NULL, image_size, PROT_READ, MAP_PRIVATE, fd, 0);
+                image = mmap_read(fd, image_size);
                 if (image == MAP_FAILED) {
                         image = NULL;
                 } else if (*(uint32_t*)image != SWAP_BE32(0x7f454C46)) {