lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 18/60] ia64:unwind: fix double free for mod->arch.init_unw_table
    Date
    From: chenzefeng <chenzefeng2@huawei.com>

    [ Upstream commit c5e5c48c16422521d363c33cfb0dcf58f88c119b ]

    The function free_module in file kernel/module.c as follow:

    void free_module(struct module *mod) {
    ......
    module_arch_cleanup(mod);
    ......
    module_arch_freeing_init(mod);
    ......
    }

    Both module_arch_cleanup and module_arch_freeing_init function
    would free the mod->arch.init_unw_table, which cause double free.

    Here, set mod->arch.init_unw_table = NULL after remove the unwind
    table to avoid double free.

    Signed-off-by: chenzefeng <chenzefeng2@huawei.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/ia64/kernel/module.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
    index d1d945c6bd05f..9fe114620b9d6 100644
    --- a/arch/ia64/kernel/module.c
    +++ b/arch/ia64/kernel/module.c
    @@ -912,8 +912,12 @@ module_finalize (const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *mo
    void
    module_arch_cleanup (struct module *mod)
    {
    - if (mod->arch.init_unw_table)
    + if (mod->arch.init_unw_table) {
    unw_remove_unwind_table(mod->arch.init_unw_table);
    - if (mod->arch.core_unw_table)
    + mod->arch.init_unw_table = NULL;
    + }
    + if (mod->arch.core_unw_table) {
    unw_remove_unwind_table(mod->arch.core_unw_table);
    + mod->arch.core_unw_table = NULL;
    + }
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-22 21:08    [W:5.124 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site