emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modprobe-small: fix bogus handling of unpack errors

Browse Source 
"modprobe minix; echo $?"

Was:
modprobe: corrupted data
modprobe: read error from 'kernel/fs/minix/minix.ko.xz': No such file or directory
modprobe: corrupted data
modprobe: read error from 'kernel/fs/minix/minix.ko.xz': No such file or directory
modprobe: corrupted data
modprobe: read error from 'kernel/fs/minix/minix.ko.xz'
modprobe: 'kernel/fs/minix/minix.ko.xz': Success
0

Now:
modprobe: corrupted data
modprobe: read error from 'kernel/fs/minix/minix.ko.xz'
1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-06-20 10:59:06 +02:00
parent 0ad872baf3
commit 5c3e060604
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modutils/modprobe-small.c
View File

@ -45,6 +45,7 @@ typedef struct module_info {
char *pathname; char *pathname;
char *aliases; char *aliases;
char *deps; char *deps;
smallint open_read_failed;
} module_info; } module_info;
/* /*
@ -222,7 +223,8 @@ static int load_module(const char *fname, const char *options)
#endif #endif
} }
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; char *module_image;
char *ptr; char *ptr;
@ -231,6 +233,7 @@ static void parse_module(module_info *info, const char *pathname)
dbg1_error_msg("parse_module('%s')", pathname); dbg1_error_msg("parse_module('%s')", pathname);
/* Read (possibly compressed) module */ /* Read (possibly compressed) module */
errno = 0;
len = 64 * 1024 * 1024; /* 64 Mb at most */ len = 64 * 1024 * 1024; /* 64 Mb at most */
module_image = xmalloc_open_zipped_read_close(pathname, &len); module_image = xmalloc_open_zipped_read_close(pathname, &len);
/* module_image == NULL is ok here, find_keyword handles it */ /* module_image == NULL is ok here, find_keyword handles it */
@ -298,9 +301,11 @@ static void parse_module(module_info *info, const char *pathname)
dbg2_error_msg("dep:'%s'", ptr); dbg2_error_msg("dep:'%s'", ptr);
append(ptr); append(ptr);
} }
free(module_image);
info->deps = copy_stringbuf(); info->deps = copy_stringbuf();
free(module_image); info->open_read_failed = (module_image == NULL);
return info->open_read_failed;
} }
static FAST_FUNC int fileAction(const char *pathname, static FAST_FUNC int fileAction(const char *pathname,
@ -331,7 +336,8 @@ static FAST_FUNC int fileAction(const char *pathname,
dbg1_error_msg("'%s' module name matches", pathname); dbg1_error_msg("'%s' module name matches", pathname);
module_found_idx = cur; 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)) { if (!(option_mask32 & OPT_r)) {
if (load_module(pathname, module_load_options) == 0) { if (load_module(pathname, module_load_options) == 0) {
@ -608,13 +614,14 @@ static int rmmod(const char *filename)
#define process_module(a,b) process_module(a) #define process_module(a,b) process_module(a)
#define cmdline_options "" #define cmdline_options ""
#endif #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; char *s, *deps, *options;
module_info **infovec; module_info **infovec;
module_info *info; module_info *info;
int infoidx; int infoidx;
int is_remove = (option_mask32 & OPT_r) != 0; int is_remove = (option_mask32 & OPT_r) != 0;
int exitcode = EXIT_SUCCESS;
dbg1_error_msg("process_module('%s','%s')", name, cmdline_options); dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
@ -628,7 +635,7 @@ static void process_module(char *name, const char *cmdline_options)
* (compat note: this allows and strips .ko suffix) * (compat note: this allows and strips .ko suffix)
*/ */
rmmod(name); rmmod(name);
return; return EXIT_SUCCESS;
} }
/* /*
@ -639,7 +646,7 @@ static void process_module(char *name, const char *cmdline_options)
*/ */
if (!is_remove && already_loaded(name)) { if (!is_remove && already_loaded(name)) {
dbg1_error_msg("nothing to do for '%s'", name); dbg1_error_msg("nothing to do for '%s'", name);
return; return EXIT_SUCCESS;
} }
options = NULL; options = NULL;
@ -741,6 +748,11 @@ static void process_module(char *name, const char *cmdline_options)
dbg1_error_msg("'%s': blacklisted", info->pathname); dbg1_error_msg("'%s': blacklisted", info->pathname);
continue; continue;
} }
if (info->open_read_failed) {
/* We already tried it, didn't work. Don't try load again */
exitcode = EXIT_FAILURE;
continue;
}
errno = 0; errno = 0;
if (load_module(info->pathname, options) != 0) { if (load_module(info->pathname, options) != 0) {
if (EEXIST != errno) { if (EEXIST != errno) {
@ -752,13 +764,14 @@ static void process_module(char *name, const char *cmdline_options)
info->pathname, info->pathname,
moderror(errno)); moderror(errno));
} }
exitcode = EXIT_FAILURE;
} }
} }
ret: ret:
free(infovec); free(infovec);
free(options); 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 #undef cmdline_options
@ -865,6 +878,7 @@ The following options are useful for people managing distributions:
int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int modprobe_main(int argc UNUSED_PARAM, char **argv) int modprobe_main(int argc UNUSED_PARAM, char **argv)
{ {
int exitcode;
struct utsname uts; struct utsname uts;
char applet0 = applet_name[0]; char applet0 = applet_name[0];
IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;) IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
@ -970,21 +984,23 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
bb_error_msg_and_die("can't insert '%s': %s", bb_error_msg_and_die("can't insert '%s': %s",
*argv, moderror(errno)); *argv, moderror(errno));
} }
return 0; return EXIT_SUCCESS;
} }
/* Try to load modprobe.dep.bb */ /* Try to load modprobe.dep.bb */
if ('r' != applet0) /* not rmmod */ if ('r' != applet0) { /* not rmmod */
load_dep_bb(); load_dep_bb();
}
/* Load/remove modules. /* Load/remove modules.
* Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */ * Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */
exitcode = EXIT_SUCCESS;
do { do {
process_module(*argv, options); exitcode |= process_module(*argv, options);
} while (*++argv); } while (*++argv);
if (ENABLE_FEATURE_CLEAN_UP) { if (ENABLE_FEATURE_CLEAN_UP) {
IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);) IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
} }
return EXIT_SUCCESS; return exitcode;
} }