kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shutdown crash caused by modules being left open.

Browse Source 
It is only safe to run ast_register_cleanup callbacks when all modules
have been unloaded.  Previously these callbacks were run during graceful
shutdown, making it possible to crash during shutdown.

ASTERISK-26513 #close

Change-Id: Ibfa635bb688d1227ec54aa211d90d6bd45052e21
This commit is contained in:
Corey Farrell
2016-10-27 22:49:43 -04:00
parent e8a3af2629
commit f373de3020
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/_private.h
View File

@@ -16,6 +16,7 @@
#define _ASTERISK__PRIVATE_H #define _ASTERISK__PRIVATE_H
int load_modules(unsigned int); /*!< Provided by loader.c */ int load_modules(unsigned int); /*!< Provided by loader.c */
int modules_shutdown(void); /*!< Provided by loader.c */
int load_pbx(void); /*!< Provided by pbx.c */ int load_pbx(void); /*!< Provided by pbx.c */
int load_pbx_builtins(void); /*!< Provided by pbx_builtins.c */ int load_pbx_builtins(void); /*!< Provided by pbx_builtins.c */
int load_pbx_functions_cli(void); /*!< Provided by pbx_functions.c */ int load_pbx_functions_cli(void); /*!< Provided by pbx_functions.c */

7
include/asterisk/module.h
View File

@@ -228,13 +228,6 @@ int ast_loader_register(int (*updater)(void));
*/ */
int ast_loader_unregister(int (*updater)(void)); int ast_loader_unregister(int (*updater)(void));
/*!
* \brief Run the unload() callback for all loaded modules
*
* This function should be called when Asterisk is shutting down gracefully.
*/
void ast_module_shutdown(void);
/*! /*!
* \brief Match modules names for the Asterisk cli. * \brief Match modules names for the Asterisk cli.
* \param line Unused by this function, but this should be the line we are * \param line Unused by this function, but this should be the line we are

5
main/asterisk.c
View File

@@ -2140,8 +2140,9 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
struct ast_json *json_object = NULL; struct ast_json *json_object = NULL;
int run_cleanups = niceness >= SHUTDOWN_NICE; int run_cleanups = niceness >= SHUTDOWN_NICE;
if (run_cleanups) { if (run_cleanups && modules_shutdown()) {
ast_module_shutdown(); ast_verb(0, "Some modules could not be unloaded, switching to fast shutdown\n");
run_cleanups = 0;
} }
if (!restart) { if (!restart) {

5
main/loader.c
View File

@@ -613,7 +613,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
#endif #endif
void ast_module_shutdown(void) int modules_shutdown(void)
{ {
struct ast_module *mod; struct ast_module *mod;
int somethingchanged = 1, final = 0; int somethingchanged = 1, final = 0;
@@ -663,7 +663,10 @@ void ast_module_shutdown(void)
} }
} while (somethingchanged && !final); } while (somethingchanged && !final);
final = AST_DLLIST_EMPTY(&module_list);
AST_DLLIST_UNLOCK(&module_list); AST_DLLIST_UNLOCK(&module_list);
return !final;
} }
int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode force) int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode force)