lkml.org 
[lkml]   [2019]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 50/85] kernel/module: Fix mem leak in module_add_modinfo_attrs
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    commit bc6f2a757d525e001268c3658bd88822e768f8db upstream.

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

    Fixes: 03e88ae1b13d ("[PATCH] fix module sysfs files reference counting")
    Reviewed-by: Miroslav Benes <mbenes@suse.cz>
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: Jessica Yu <jeyu@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/module.c | 22 +++++++++++++++++-----
    1 file changed, 17 insertions(+), 5 deletions(-)

    --- a/kernel/module.c
    +++ b/kernel/module.c
    @@ -1697,6 +1697,8 @@ static int add_usage_links(struct module
    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;
    @@ -1711,24 +1713,34 @@ static int module_add_modinfo_attrs(stru
    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;
    @@ -1816,7 +1828,7 @@ static int mod_sysfs_setup(struct module
    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:
    @@ -1852,7 +1864,7 @@ static void mod_sysfs_fini(struct module
    {
    }

    -static void module_remove_modinfo_attrs(struct module *mod)
    +static void module_remove_modinfo_attrs(struct module *mod, int end)
    {
    }

    @@ -1868,7 +1880,7 @@ static void init_param_lock(struct modul
    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);

    \
     
     \ /
      Last update: 2019-09-18 08:30    [W:4.191 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site