kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 07:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential double free when unloading a module.

Browse Source 
........

Merged revisions 378092 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 378093 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@378094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-12-17 23:09:45 +00:00
parent ac78bb107a
commit d571d53fa4
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/loader.c
View File

@@ -237,9 +237,18 @@ void __ast_module_user_remove(struct ast_module *mod, struct ast_module_user *u)
if (!u) { if (!u) {
return; return;
} }
AST_LIST_LOCK(&mod->users); AST_LIST_LOCK(&mod->users);
AST_LIST_REMOVE(&mod->users, u, entry); u = AST_LIST_REMOVE(&mod->users, u, entry);
AST_LIST_UNLOCK(&mod->users); AST_LIST_UNLOCK(&mod->users);
if (!u) {
/*
* Was not in the list. Either a bad pointer or
* __ast_module_user_hangup_all() has been called.
*/
return;
}
ast_atomic_fetchadd_int(&mod->usecount, -1); ast_atomic_fetchadd_int(&mod->usecount, -1);
ast_free(u); ast_free(u);
@@ -559,18 +568,29 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
} }
if (!error) { if (!error) {
/* Request any channels attached to the module to hangup. */
__ast_module_user_hangup_all(mod); __ast_module_user_hangup_all(mod);
res = mod->info->unload();
res = mod->info->unload();
if (res) { if (res) {
ast_log(LOG_WARNING, "Firm unload failed for %s\n", resource_name); ast_log(LOG_WARNING, "Firm unload failed for %s\n", resource_name);
if (force <= AST_FORCE_FIRM) if (force <= AST_FORCE_FIRM) {
error = 1; error = 1;
else } else {
ast_log(LOG_WARNING, "** Dangerous **: Unloading resource anyway, at user request\n"); ast_log(LOG_WARNING, "** Dangerous **: Unloading resource anyway, at user request\n");
} }
} }
if (!error) {
/*
* Request hangup on any channels that managed to get attached
* while we called the module unload function.
*/
__ast_module_user_hangup_all(mod);
sched_yield();
}
}
if (!error) if (!error)
mod->flags.running = mod->flags.declined = 0; mod->flags.running = mod->flags.declined = 0;