diff options
| author | Corey Farrell <git@cfware.com> | 2016-10-27 22:49:43 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-10-28 01:11:21 -0400 |
| commit | f373de302032c13487cfcaa616fc070f10d68b57 (patch) | |
| tree | 4451b091ff631011a14d12edfeb10857056dd387 | |
| parent | e8a3af2629ff8668b4ebd78a50bfebdbfaa66a6e (diff) | |
Fix shutdown crash caused by modules being left open.
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
| -rw-r--r-- | include/asterisk/_private.h | 1 | ||||
| -rw-r--r-- | include/asterisk/module.h | 7 | ||||
| -rw-r--r-- | main/asterisk.c | 5 | ||||
| -rw-r--r-- | main/loader.c | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h index 9255dc1de..d4a0d7251 100644 --- a/include/asterisk/_private.h +++ b/include/asterisk/_private.h @@ -16,6 +16,7 @@ #define _ASTERISK__PRIVATE_H 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_builtins(void); /*!< Provided by pbx_builtins.c */ int load_pbx_functions_cli(void); /*!< Provided by pbx_functions.c */ diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 35ee8bbd7..b92043b84 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -228,13 +228,6 @@ int ast_loader_register(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. * \param line Unused by this function, but this should be the line we are diff --git a/main/asterisk.c b/main/asterisk.c index 92993d34f..de00f4faa 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2140,8 +2140,9 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart) struct ast_json *json_object = NULL; int run_cleanups = niceness >= SHUTDOWN_NICE; - if (run_cleanups) { - ast_module_shutdown(); + if (run_cleanups && modules_shutdown()) { + ast_verb(0, "Some modules could not be unloaded, switching to fast shutdown\n"); + run_cleanups = 0; } if (!restart) { diff --git a/main/loader.c b/main/loader.c index 85aeb249e..74254b4fa 100644 --- a/main/loader.c +++ b/main/loader.c @@ -613,7 +613,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned #endif -void ast_module_shutdown(void) +int modules_shutdown(void) { struct ast_module *mod; int somethingchanged = 1, final = 0; @@ -663,7 +663,10 @@ void ast_module_shutdown(void) } } while (somethingchanged && !final); + final = AST_DLLIST_EMPTY(&module_list); AST_DLLIST_UNLOCK(&module_list); + + return !final; } int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode force) |