aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-23 00:18:25 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-12-23 02:09:05 -0500
commitd172f4ef31bec924c6ebcb242c9d7d290811e1e5 (patch)
tree2c694919af4a14170a77b8c704151eb8a65851f0
parente5f114e97d6e4833e90ca408af9eb1e7a3262b5e (diff)
Modules: fix memory leak of module names
Due to the change in kobject name handling, the module kobject needs to have a null release function to ensure that the name it previously set will be properly cleaned up. All of this wierdness goes away in 2.6.25 with the rework of the kobject name and cleanup logic, but this is required for 2.6.24. Thanks to Alexey Dobriyan for finding the problem, and to Kay Sievers for pointing out the simple way to fix it after I tried many complex ways. Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--kernel/params.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/params.c b/kernel/params.c
index 2a4c51487e72..7686417ee00e 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -697,8 +697,18 @@ static struct kset_uevent_ops module_uevent_ops = {
697decl_subsys(module, &module_ktype, &module_uevent_ops); 697decl_subsys(module, &module_ktype, &module_uevent_ops);
698int module_sysfs_initialized; 698int module_sysfs_initialized;
699 699
700static void module_release(struct kobject *kobj)
701{
702 /*
703 * Stupid empty release function to allow the memory for the kobject to
704 * be properly cleaned up. This will not need to be present for 2.6.25
705 * with the upcoming kobject core rework.
706 */
707}
708
700static struct kobj_type module_ktype = { 709static struct kobj_type module_ktype = {
701 .sysfs_ops = &module_sysfs_ops, 710 .sysfs_ops = &module_sysfs_ops,
711 .release = module_release,
702}; 712};
703 713
704/* 714/*