> Feedback is extremely welcome,
OK...you asked for it. I found three separate bugs, two of them oopsed the
system, and the other prevented module unloading. Did you try it with
CONFIG_MODULE_UNLOAD? :) You also need to test for null init functions,
because the module_init/module_exit mode creates them. Patch appended.
Also...some guy once posted (http://lwn.net/Articles/22763/):
I appeciate the series in modernizing modules, but just FYI, I
don't think the old-style init_module/cleanup_module stuff will
break any time soon: there are still a large number of drivers
which use it, and there's not much point making such changes.
This patch breaks the old init_module/cleanup_module scheme; those
functions no longer get called. Was that intentional?
jon
P.S. Beyond that, I think the patch makes sense :)
Jonathan Corbet
Executive editor, LWN.net
corbet@lwn.net
--- 2.5.73-rr/kernel/module.c Tue Jun 24 02:58:32 2003
+++ 2.5.73/kernel/module.c Tue Jun 24 03:00:36 2003
@@ -617,9 +617,10 @@
{
int i, balance = 0;
- for (i = 0; i < num_pairs; i++)
+ for (i = 0; i < num_pairs; i++) {
balance += (pairs->init ? 1 : 0) - (pairs->exit ? 1 : 0);
-
+ pairs++;
+ }
return balance == 0;
}
@@ -643,7 +644,7 @@
{
struct module *mod;
char name[MODULE_NAME_LEN];
- unsigned int i;
+ int i;
int ret, forced = 0;
if (!capable(CAP_SYS_MODULE))
@@ -1725,6 +1726,8 @@
/* Start the module */
for (i = 0; i < mod->num_ie_pairs; i++) {
+ if (mod->ie_pairs[i].init == NULL)
+ continue;
ret = mod->ie_pairs[i].init();
if (ret != 0) {
DEBUGP("%s: init/exit pair init=%p failed: %i\n",
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:42 EST