summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchenzefeng <chenzefeng2@huawei.com>2019-08-06 15:46:33 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 12:30:20 +0200
commitbfd6664e50761385973e315575ffe0ff4ef84f7c (patch)
treeea751f2807735747ef3a05a71add345bee8cee74
parentfaad3576b5a2993b3fbc25f61c6cc6349eb45f63 (diff)
ia64:unwind: fix double free for mod->arch.init_unw_table
[ 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>
-rw-r--r--arch/ia64/kernel/module.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index d1d945c6bd05..9fe114620b9d 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;
+ }
}