sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pbx_ael: Fix crash and lockup issue regarding 'ael reload' 

Currently pbx_ael does not check if a reload is currently pending
before proceeding with a reload. This can cause multiple threads to
operate at the same time on what should be mutex protected data. This
change adds protection to reloading to ensure only one ael reload is
executing at a time.

ASTERISK-29609 #close

Change-Id: I5ed392ad226f6e4e7696ad742076d3e45c57af35
This commit is contained in:
Mark Murawski 2021-08-31 16:03:56 -04:00 committed by George Joseph
parent 0e4a1c5079
commit 185321066f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pbx/pbx_ael.c
View File

@ -245,7 +245,13 @@ static char *handle_cli_ael_reload(struct ast_cli_entry *e, int cmd, struct ast_
if (a->argc != 2)
return CLI_SHOWUSAGE;
#ifndef STANDALONE
/* Lock-Protected reload. It is VERY BAD to have simultaneous ael load_module() executing at the same time */
return ast_module_reload("pbx_ael") == AST_MODULE_RELOAD_SUCCESS ? CLI_SUCCESS : CLI_FAILURE;
#else
/* Lock-Protected reload not needed (and not available) when running standalone (Example: via aelparse cli tool). No reload contention is possible */
return (pbx_load_module() ? CLI_FAILURE : CLI_SUCCESS);
#endif
}
static struct ast_cli_entry cli_ael[] = {
@ -274,7 +280,13 @@ static int load_module(void)
static int reload(void)
{
#ifndef STANDALONE
/* Lock-Protected reload. It is VERY BAD to have simultaneous ael pbx_load_module() executing at the same time */
return ast_module_reload("pbx_ael") == AST_MODULE_RELOAD_SUCCESS ? AST_MODULE_LOAD_SUCCESS : AST_MODULE_LOAD_DECLINE;
#else
/* Lock-Protected reload not needed (and not available) when running standalone (Example: via aelparse cli tool). No reload contention is possible */
return pbx_load_module();
#endif
}
#ifdef STANDALONE