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

modprobe: do not use ->probed_name blidly

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-17 20:33:50 +02:00
parent ee47f6e44f
commit 7eaf58d958
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modutils/modprobe.c
View File

@ -220,6 +220,12 @@ static int read_config(const char *path)
config_file_action, NULL, NULL, 1); config_file_action, NULL, NULL, 1);
} }
static const char *humanly_readable_name(struct module_entry *m)
{
/* probed_name may be NULL. modname always exists. */
return m->probed_name ? m->probed_name : m->modname;
}
/* Return: similar to bb_init_module: /* Return: similar to bb_init_module:
* 0 on success, * 0 on success,
* -errno on open/read error, * -errno on open/read error,
@ -234,7 +240,8 @@ static int do_modprobe(struct module_entry *m)
if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) { if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
if (!(option_mask32 & INSMOD_OPT_SILENT)) if (!(option_mask32 & INSMOD_OPT_SILENT))
bb_error_msg("module %s not found in modules.dep", m->probed_name); bb_error_msg("module %s not found in modules.dep",
humanly_readable_name(m));
return -ENOENT; return -ENOENT;
} }
DBG("do_modprob'ing %s", m->modname); DBG("do_modprob'ing %s", m->modname);
@ -259,7 +266,7 @@ static int do_modprobe(struct module_entry *m)
if (rc) { if (rc) {
if (first) { if (first) {
bb_error_msg("failed to unload module %s: %s", bb_error_msg("failed to unload module %s: %s",
m2->probed_name ? m2->probed_name : m2->modname, humanly_readable_name(m2),
moderror(rc)); moderror(rc));
break; break;
} }
@ -286,7 +293,7 @@ static int do_modprobe(struct module_entry *m)
free(options); free(options);
if (rc) { if (rc) {
bb_error_msg("failed to load module %s (%s): %s", bb_error_msg("failed to load module %s (%s): %s",
m2->probed_name ? m2->probed_name : m2->modname, humanly_readable_name(m2),
fn, fn,
moderror(rc) moderror(rc)
); );