Skip to contentSkip to conversation

Missing module_arch_cleanup call

PATCH New Rusty Russell 1 participant 1 message Sep 11, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Missing module_arch_cleanup call

Linus, please apply.

Cheers,
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Name: Always call module_arch_cleanup
Author: Rusty Russell
Status: Booted on 2.6.0-test5-bk1

D: Bug reported by Paul Mackerras: if a module parameter fails, we didn't
D: call module_arch_cleanup().

kernel/module.c +3 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test5-bk1/kernel/module.c working-2.6.0-test5-bk1-module-greg-orig/kernel/module.c
@@ -1653,7 +1660,7 @@ static struct module *load_module(void _
 				 NULL);
 	}
 	if (err < 0)
-		goto cleanup;
+		goto arch_cleanup;
 
 	/* Get rid of temporary copy */
 	vfree(hdr);
@@ -1661,6 +1668,8 @@ static struct module *load_module(void _
 	/* Done! */
 	return mod;
 
+ arch_cleanup:
+	module_arch_cleanup(mod);
  cleanup:
 	module_unload_free(mod);
 	module_free(mod, mod->module_init);