apply post-1.18.1 patches, bump version to 1.18.21_18_2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index ec3ddfb8f..f4f17e766 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -844,13 +844,15 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 void *map;
 
                 len = MAXINT(ssize_t);
-                map = xmalloc_xopen_read_close(*argv, &len);
+                map = xmalloc_open_zipped_read_close(*argv, &len);
                 if (init_module(map, len,
                         IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
                         IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
-                                ) != 0)
+                        ) != 0
+                ) {
                         bb_error_msg_and_die("can't insert '%s': %s",
                                         *argv, moderror(errno));
+                }
                 return 0;
         }