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

modprobe: fix more bugs in modprobe -r

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-05-28 03:54:29 +02:00
parent 398c659970
commit f3cbfc0e2c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modutils/modprobe.c
View File

@ -211,9 +211,9 @@ static int read_config(const char *path)
static int do_modprobe(struct module_entry *m)
{
struct module_entry *m2;
struct module_entry *m2 = m2; /* for compiler */
char *fn, *options;
int rc = -1;
int rc, first;
llist_t *l;
if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
@ -228,13 +228,22 @@ static int do_modprobe(struct module_entry *m)
for (l = m->deps; l != NULL; l = l->link)
DBG("dep: %s", l->data);
first = 1;
rc = 0;
while (m->deps && rc == 0) {
fn = llist_pop(&m->deps);
m2 = get_or_add_modentry(fn);
if (option_mask32 & MODPROBE_OPT_REMOVE) {
if (bb_delete_module(m->modname, O_EXCL) != 0)
rc = errno;
if (m2->flags & MODULE_FLAG_LOADED) {
if (bb_delete_module(m2->modname, O_EXCL) != 0) {
if (first)
rc = errno;
} else {
m2->flags &= ~MODULE_FLAG_LOADED;
}
}
/* do not error out if *deps* fail to unload */
first = 0;
} else if (!(m2->flags & MODULE_FLAG_LOADED)) {
options = m2->options;
m2->options = NULL;
@ -252,11 +261,10 @@ static int do_modprobe(struct module_entry *m)
free(fn);
}
//FIXME: what if rc < 0?
if (rc > 0 && !(option_mask32 & INSMOD_OPT_SILENT)) {
if (rc && !(option_mask32 & INSMOD_OPT_SILENT)) {
bb_error_msg("failed to %sload module %s: %s",
(option_mask32 & MODPROBE_OPT_REMOVE) ? "un" : "",
m->probed_name ? m->probed_name : m->modname,
m2->probed_name ? m2->probed_name : m2->modname,
moderror(rc)
);
}