Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b53e102 authored by YueHaibing's avatar YueHaibing Committed by Greg Kroah-Hartman
Browse files

kernel/module: Fix mem leak in module_add_modinfo_attrs 



[ Upstream commit bc6f2a757d525e001268c3658bd88822e768f8db ]

In module_add_modinfo_attrs if sysfs_create_file
fails, we forget to free allocated modinfo_attrs
and roll back the sysfs files.

Fixes: 03e88ae1 ("[PATCH] fix module sysfs files reference counting")
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2eff0ac9

kernel/module.c

+17 −5
Original line number Diff line number Diff line
@@ -1695,6 +1695,8 @@ static int add_usage_links(struct module *mod) 
	return ret;

}



static void module_remove_modinfo_attrs(struct module *mod, int end);



static int module_add_modinfo_attrs(struct module *mod)

{

	struct module_attribute *attr;
@@ -1709,24 +1711,34 @@ static int module_add_modinfo_attrs(struct module *mod) 
		return -ENOMEM;



	temp_attr = mod->modinfo_attrs;

	for (i = 0; (attr = modinfo_attrs[i]) && !error; i++) {

	for (i = 0; (attr = modinfo_attrs[i]); i++) {

		if (!attr->test || attr->test(mod)) {

			memcpy(temp_attr, attr, sizeof(*temp_attr));

			sysfs_attr_init(&temp_attr->attr);

			error = sysfs_create_file(&mod->mkobj.kobj,

					&temp_attr->attr);

			if (error)

				goto error_out;

			++temp_attr;

		}

	}



	return 0;



error_out:

	if (i > 0)

		module_remove_modinfo_attrs(mod, --i);

	return error;

}



static void module_remove_modinfo_attrs(struct module *mod)

static void module_remove_modinfo_attrs(struct module *mod, int end)

{

	struct module_attribute *attr;

	int i;



	for (i = 0; (attr = &mod->modinfo_attrs[i]); i++) {

		if (end >= 0 && i > end)

			break;

		/* pick a field to test for end of list */

		if (!attr->attr.name)

			break;
@@ -1814,7 +1826,7 @@ static int mod_sysfs_setup(struct module *mod, 
	return 0;



out_unreg_modinfo_attrs:

	module_remove_modinfo_attrs(mod);

	module_remove_modinfo_attrs(mod, -1);

out_unreg_param:

	module_param_sysfs_remove(mod);

out_unreg_holders:
@@ -1850,7 +1862,7 @@ static void mod_sysfs_fini(struct module *mod) 
{

}



static void module_remove_modinfo_attrs(struct module *mod)

static void module_remove_modinfo_attrs(struct module *mod, int end)

{

}
@@ -1866,7 +1878,7 @@ static void init_param_lock(struct module *mod) 
static void mod_sysfs_teardown(struct module *mod)

{

	del_usage_links(mod);

	module_remove_modinfo_attrs(mod);

	module_remove_modinfo_attrs(mod, -1);

	module_param_sysfs_remove(mod);

	kobject_put(mod->mkobj.drivers_dir);

	kobject_put(mod->holders_dir);