Commit f9da8a74 authored by Doug Ledford's avatar Doug Ledford

Merge aladin.rdu.redhat.com:/usr/local/home/dledford/bk/linus-2.5

into aladin.rdu.redhat.com:/usr/src/2.5
parents f6c8e663 d0081995
...@@ -1098,6 +1098,15 @@ sys_init_module(void *umod, ...@@ -1098,6 +1098,15 @@ sys_init_module(void *umod,
list_add(&mod->extable.list, &extables); list_add(&mod->extable.list, &extables);
spin_unlock_irq(&modlist_lock); spin_unlock_irq(&modlist_lock);
/* Note, setting the mod->live to 1 here is safe because we haven't
* linked the module into the system's kernel symbol table yet,
* which means that the only way any other kernel code can call
* into this module right now is if this module hands out entry
* pointers to the other code. We assume that no module hands out
* entry pointers to the rest of the kernel unless it is ready to
* have them used.
*/
mod->live = 1;
/* Start the module */ /* Start the module */
ret = mod->init ? mod->init() : 0; ret = mod->init ? mod->init() : 0;
if (ret < 0) { if (ret < 0) {
...@@ -1110,9 +1119,10 @@ sys_init_module(void *umod, ...@@ -1110,9 +1119,10 @@ sys_init_module(void *umod,
/* Mark it "live" so that they can force /* Mark it "live" so that they can force
deletion later, and we don't keep getting deletion later, and we don't keep getting
woken on every decrement. */ woken on every decrement. */
mod->live = 1; } else {
} else mod->live = 0;
free_module(mod); free_module(mod);
}
up(&module_mutex); up(&module_mutex);
return ret; return ret;
} }
...@@ -1127,7 +1137,6 @@ sys_init_module(void *umod, ...@@ -1127,7 +1137,6 @@ sys_init_module(void *umod,
mod->module_init = NULL; mod->module_init = NULL;
/* All ok! */ /* All ok! */
mod->live = 1;
up(&module_mutex); up(&module_mutex);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment