From: Mark Murawski <markm@intellasoft.net>
Date: Tue, 31 Aug 2021 20:03:56 +0000 (-0400)
Subject: pbx_ael:  Fix crash and lockup issue regarding 'ael reload'
X-Git-Tag: 18.7.0-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042ae05be7a24c1c50d1f769898eb6a81f38e45d;p=thirdparty%2Fasterisk.git

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
---

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index d55f2d42af..8bf3af0a8e 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -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