Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Merge "Fix unsafe uses of ast_context pointers."

Browse Source
changes/14/614/1
Matt Jordan 10 years ago committed by Gerrit Code Review
parent 53c1126090 80621ce3c5
commit bbeb753e5e
9 changed files with 69 additions and 57 deletions
Show Stats Download Patch File Download Diff File

18
apps/app_meetme.c
Unescape View File

@ -7539,14 +7539,13 @@ static int sla_build_trunk(struct ast_config *cfg, const char *cat)
ao2_unlock(trunk); ao2_unlock(trunk);
if (!ast_strlen_zero(trunk->autocontext)) { if (!ast_strlen_zero(trunk->autocontext)) {
struct ast_context *context; if (!ast_context_find_or_create(NULL, NULL, trunk->autocontext, sla_registrar)) {
context = ast_context_find_or_create(NULL, NULL, trunk->autocontext, sla_registrar);
if (!context) {
ast_log(LOG_ERROR, "Failed to automatically find or create " ast_log(LOG_ERROR, "Failed to automatically find or create "
"context '%s' for SLA!\n", trunk->autocontext); "context '%s' for SLA!\n", trunk->autocontext);
return -1; return -1;
} }
if (ast_add_extension2(context, 0 /* don't replace */, "s", 1,
if (ast_add_extension(trunk->autocontext, 0 /* don't replace */, "s", 1,
NULL, NULL, slatrunk_app, ast_strdup(trunk->name), ast_free_ptr, sla_registrar)) { NULL, NULL, slatrunk_app, ast_strdup(trunk->name), ast_free_ptr, sla_registrar)) {
ast_log(LOG_ERROR, "Failed to automatically create extension " ast_log(LOG_ERROR, "Failed to automatically create extension "
"for trunk '%s'!\n", trunk->name); "for trunk '%s'!\n", trunk->name);
@ -7715,17 +7714,16 @@ static int sla_build_station(struct ast_config *cfg, const char *cat)
ao2_unlock(station); ao2_unlock(station);
if (!ast_strlen_zero(station->autocontext)) { if (!ast_strlen_zero(station->autocontext)) {
struct ast_context *context;
struct sla_trunk_ref *trunk_ref; struct sla_trunk_ref *trunk_ref;
context = ast_context_find_or_create(NULL, NULL, station->autocontext, sla_registrar);
if (!context) { if (!ast_context_find_or_create(NULL, NULL, station->autocontext, sla_registrar)) {
ast_log(LOG_ERROR, "Failed to automatically find or create " ast_log(LOG_ERROR, "Failed to automatically find or create "
"context '%s' for SLA!\n", station->autocontext); "context '%s' for SLA!\n", station->autocontext);
return -1; return -1;
} }
/* The extension for when the handset goes off-hook. /* The extension for when the handset goes off-hook.
* exten => station1,1,SLAStation(station1) */ * exten => station1,1,SLAStation(station1) */
if (ast_add_extension2(context, 0 /* don't replace */, station->name, 1, if (ast_add_extension(station->autocontext, 0 /* don't replace */, station->name, 1,
NULL, NULL, slastation_app, ast_strdup(station->name), ast_free_ptr, sla_registrar)) { NULL, NULL, slastation_app, ast_strdup(station->name), ast_free_ptr, sla_registrar)) {
ast_log(LOG_ERROR, "Failed to automatically create extension " ast_log(LOG_ERROR, "Failed to automatically create extension "
"for trunk '%s'!\n", station->name); "for trunk '%s'!\n", station->name);
@ -7738,7 +7736,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat)
snprintf(hint, sizeof(hint), "SLA:%s", exten); snprintf(hint, sizeof(hint), "SLA:%s", exten);
/* Extension for this line button /* Extension for this line button
* exten => station1_line1,1,SLAStation(station1_line1) */ * exten => station1_line1,1,SLAStation(station1_line1) */
if (ast_add_extension2(context, 0 /* don't replace */, exten, 1, if (ast_add_extension(station->autocontext, 0 /* don't replace */, exten, 1,
NULL, NULL, slastation_app, ast_strdup(exten), ast_free_ptr, sla_registrar)) { NULL, NULL, slastation_app, ast_strdup(exten), ast_free_ptr, sla_registrar)) {
ast_log(LOG_ERROR, "Failed to automatically create extension " ast_log(LOG_ERROR, "Failed to automatically create extension "
"for trunk '%s'!\n", station->name); "for trunk '%s'!\n", station->name);
@ -7746,7 +7744,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat)
} }
/* Hint for this line button /* Hint for this line button
* exten => station1_line1,hint,SLA:station1_line1 */ * exten => station1_line1,hint,SLA:station1_line1 */
if (ast_add_extension2(context, 0 /* don't replace */, exten, PRIORITY_HINT, if (ast_add_extension(station->autocontext, 0 /* don't replace */, exten, PRIORITY_HINT,
NULL, NULL, hint, NULL, NULL, sla_registrar)) { NULL, NULL, hint, NULL, NULL, sla_registrar)) {
ast_log(LOG_ERROR, "Failed to automatically create hint " ast_log(LOG_ERROR, "Failed to automatically create hint "
"for trunk '%s'!\n", station->name); "for trunk '%s'!\n", station->name);

5
channels/chan_iax2.c
Unescape View File

@ -14626,7 +14626,6 @@ static void cleanup_thread_list(void *head)
static int __unload_module(void) static int __unload_module(void)
{ {
struct ast_context *con;
int x; int x;
network_change_stasis_unsubscribe(); network_change_stasis_unsubscribe();
@ -14703,9 +14702,7 @@ static int __unload_module(void)
sched = NULL; sched = NULL;
ao2_ref(peercnts, -1); ao2_ref(peercnts, -1);
con = ast_context_find(regcontext); ast_context_destroy_by_name(regcontext, "IAX2");
if (con)
ast_context_destroy(con, "IAX2");
ast_unload_realtime("iaxpeers"); ast_unload_realtime("iaxpeers");
ao2_ref(iax2_tech.capabilities, -1); ao2_ref(iax2_tech.capabilities, -1);

9
channels/chan_sip.c
Unescape View File

@ -19740,8 +19740,7 @@ static void cleanup_stale_contexts(char *new, char *old)
} }
} }
if (stalecontext) ast_context_destroy_by_name(stalecontext, "SIP");
ast_context_destroy(ast_context_find(stalecontext), "SIP");
} }
} }
@ -34550,7 +34549,6 @@ static int unload_module(void)
{ {
struct sip_pvt *p; struct sip_pvt *p;
struct sip_threadinfo *th; struct sip_threadinfo *th;
struct ast_context *con;
struct ao2_iterator i; struct ao2_iterator i;
int wait_count; int wait_count;
@ -34730,10 +34728,7 @@ static int unload_module(void)
close(sipsock); close(sipsock);
io_context_destroy(io); io_context_destroy(io);
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
con = ast_context_find(used_context); ast_context_destroy_by_name(used_context, "SIP");
if (con) {
ast_context_destroy(con, "SIP");
}
ast_unload_realtime("sipregs"); ast_unload_realtime("sipregs");
ast_unload_realtime("sippeers"); ast_unload_realtime("sippeers");
ast_cc_monitor_unregister(&sip_cc_monitor_callbacks); ast_cc_monitor_unregister(&sip_cc_monitor_callbacks);

8
channels/chan_skinny.c
Unescape View File

@ -2198,8 +2198,7 @@ static void cleanup_stale_contexts(char *new, char *old)
} }
} }
if (stalecontext) ast_context_destroy_by_name(stalecontext, "Skinny");
ast_context_destroy(ast_context_find(stalecontext), "Skinny");
} }
} }
@ -8717,7 +8716,6 @@ static int unload_module(void)
struct skinny_device *d; struct skinny_device *d;
struct skinny_line *l; struct skinny_line *l;
struct skinny_subchannel *sub; struct skinny_subchannel *sub;
struct ast_context *con;
pthread_t tempthread; pthread_t tempthread;
ast_rtp_glue_unregister(&skinny_rtp_glue); ast_rtp_glue_unregister(&skinny_rtp_glue);
@ -8778,9 +8776,7 @@ static int unload_module(void)
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
} }
con = ast_context_find(used_context); ast_context_destroy_by_name(used_context, "Skinny");
if (con)
ast_context_destroy(con, "Skinny");
ao2_ref(default_cap, -1); ao2_ref(default_cap, -1);
return 0; return 0;

16
include/asterisk/pbx.h
Unescape View File

@ -300,7 +300,21 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts,
void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_hashtab *exttable, const char *registrar); void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_hashtab *exttable, const char *registrar);
/*! /*!
* \brief Destroy a context (matches the specified context (or ANY context if NULL) * \brief Destroy a context by name
*
* \param context Name of the context to destroy
* \param registrar who registered it
*
* You can optionally leave out the registrar parameter. It will find it
* based on the context name.
*
* \retval -1 context not found
* \retval 0 Success
*/
int ast_context_destroy_by_name(const char *context, const char *registrar);
/*!
* \brief Destroy a context (matches the specified context or ANY context if NULL)
* *
* \param con context to destroy * \param con context to destroy
* \param registrar who registered it * \param registrar who registered it

36
main/pbx.c
Unescape View File

@ -8739,9 +8739,9 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts,
ast_rdlock_contexts(); ast_rdlock_contexts();
local_contexts = &contexts; local_contexts = &contexts;
tmp = ast_hashtab_lookup(contexts_table, &search); tmp = ast_hashtab_lookup(contexts_table, &search);
ast_unlock_contexts();
if (tmp) { if (tmp) {
tmp->refcount++; tmp->refcount++;
ast_unlock_contexts();
return tmp; return tmp;
} }
} else { /* local contexts just in a linked list; search there for the new context; slow, linear search, but not frequent */ } else { /* local contexts just in a linked list; search there for the new context; slow, linear search, but not frequent */
@ -8765,11 +8765,13 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts,
tmp->refcount = 1; tmp->refcount = 1;
} else { } else {
ast_log(LOG_ERROR, "Danger! We failed to allocate a context for %s!\n", name); ast_log(LOG_ERROR, "Danger! We failed to allocate a context for %s!\n", name);
if (!extcontexts) {
ast_unlock_contexts();
}
return NULL; return NULL;
} }
if (!extcontexts) { if (!extcontexts) {
ast_wrlock_contexts();
tmp->next = *local_contexts; tmp->next = *local_contexts;
*local_contexts = tmp; *local_contexts = tmp;
ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */ ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */
@ -9668,18 +9670,24 @@ int ast_context_add_ignorepat2(struct ast_context *con, const char *value, const
int ast_ignore_pattern(const char *context, const char *pattern) int ast_ignore_pattern(const char *context, const char *pattern)
{ {
struct ast_context *con = ast_context_find(context); int ret = 0;
struct ast_context *con;
ast_rdlock_contexts();
con = ast_context_find(context);
if (con) { if (con) {
struct ast_ignorepat *pat; struct ast_ignorepat *pat;
for (pat = con->ignorepats; pat; pat = pat->next) { for (pat = con->ignorepats; pat; pat = pat->next) {
if (ast_extension_match(pat->pattern, pattern)) if (ast_extension_match(pat->pattern, pattern)) {
return 1; ret = 1;
break;
}
} }
} }
ast_unlock_contexts();
return 0; return ret;
} }
/* /*
@ -10887,6 +10895,22 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context
} }
} }
int ast_context_destroy_by_name(const char *context, const char *registrar)
{
struct ast_context *con;
int ret = -1;
ast_wrlock_contexts();
con = ast_context_find(context);
if (con) {
ast_context_destroy(con, registrar);
ret = 0;
}
ast_unlock_contexts();
return ret;
}
void ast_context_destroy(struct ast_context *con, const char *registrar) void ast_context_destroy(struct ast_context *con, const char *registrar)
{ {
ast_wrlock_contexts(); ast_wrlock_contexts();

15
pbx/pbx_config.c
Unescape View File

@ -133,8 +133,6 @@ static char *complete_dialplan_remove_context(struct ast_cli_args *);
static char *handle_cli_dialplan_remove_context(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_cli_dialplan_remove_context(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct ast_context *con;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "dialplan remove context"; e->command = "dialplan remove context";
@ -150,16 +148,11 @@ static char *handle_cli_dialplan_remove_context(struct ast_cli_entry *e, int cmd
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
} }
con = ast_context_find(a->argv[3]); if (ast_context_destroy_by_name(a->argv[3], NULL)) {
ast_cli(a->fd, "There is no such context as '%s'\n", a->argv[3]);
if (!con) { return CLI_SUCCESS;
ast_cli(a->fd, "There is no such context as '%s'\n",
a->argv[3]);
return CLI_SUCCESS;
} else { } else {
ast_context_destroy(con, registrar); ast_cli(a->fd, "Removed context '%s'\n", a->argv[3]);
ast_cli(a->fd, "Removing context '%s'\n",
a->argv[3]);
return CLI_SUCCESS; return CLI_SUCCESS;
} }
} }

10
tests/test_gosub.c
Unescape View File

@ -42,10 +42,10 @@ ASTERISK_REGISTER_FILE()
AST_TEST_DEFINE(test_gosub) AST_TEST_DEFINE(test_gosub)
{ {
#define CONTEXT_NAME "tests_test_gosub_virtual_context"
int res = AST_TEST_PASS, i; int res = AST_TEST_PASS, i;
struct ast_channel *chan; struct ast_channel *chan;
struct ast_str *str; struct ast_str *str;
struct ast_context *con;
struct testplan { struct testplan {
const char *app; const char *app;
const char *args; const char *args;
@ -119,14 +119,14 @@ AST_TEST_DEFINE(test_gosub)
} }
/* Create our test dialplan */ /* Create our test dialplan */
if (!(con = ast_context_find_or_create(NULL, NULL, "tests_test_gosub_virtual_context", "test_gosub"))) { if (!ast_context_find_or_create(NULL, NULL, CONTEXT_NAME, "test_gosub")) {
ast_test_status_update(test, "Unable to create test dialplan context"); ast_test_status_update(test, "Unable to create test dialplan context");
ast_free(str); ast_free(str);
ast_channel_unref(chan); ast_channel_unref(chan);
return AST_TEST_FAIL; return AST_TEST_FAIL;
} }
ast_add_extension2(con, 1, "s", 1, NULL, NULL, "NoOp", ast_strdup(""), ast_free_ptr, "test_gosub"); ast_add_extension(CONTEXT_NAME, 1, "s", 1, NULL, NULL, "NoOp", ast_strdup(""), ast_free_ptr, "test_gosub");
for (i = 0; i < ARRAY_LEN(testplan); i++) { for (i = 0; i < ARRAY_LEN(testplan); i++) {
if (testplan[i].app == NULL) { if (testplan[i].app == NULL) {
@ -157,8 +157,8 @@ AST_TEST_DEFINE(test_gosub)
ast_free(str); ast_free(str);
ast_channel_unref(chan); ast_channel_unref(chan);
ast_context_remove_extension2(con, "s", 1, NULL, 0); ast_context_remove_extension(CONTEXT_NAME, "s", 1, NULL);
ast_context_destroy(con, "test_gosub"); ast_context_destroy(NULL, "test_gosub");
return res; return res;
} }

9
tests/test_pbx.c
Unescape View File

@ -198,7 +198,6 @@ AST_TEST_DEFINE(pattern_match_test)
*/ */
struct { struct {
const char * context_string; const char * context_string;
struct ast_context *context;
} contexts[] = { } contexts[] = {
{ TEST_PATTERN, }, { TEST_PATTERN, },
{ TEST_PATTERN_INCLUDE, }, { TEST_PATTERN_INCLUDE, },
@ -267,7 +266,7 @@ AST_TEST_DEFINE(pattern_match_test)
*/ */
for (i = 0; i < ARRAY_LEN(contexts); ++i) { for (i = 0; i < ARRAY_LEN(contexts); ++i) {
if (!(contexts[i].context = ast_context_find_or_create(NULL, NULL, contexts[i].context_string, registrar))) { if (!ast_context_find_or_create(NULL, NULL, contexts[i].context_string, registrar)) {
ast_test_status_update(test, "Failed to create context %s\n", contexts[i].context_string); ast_test_status_update(test, "Failed to create context %s\n", contexts[i].context_string);
res = AST_TEST_FAIL; res = AST_TEST_FAIL;
goto cleanup; goto cleanup;
@ -319,11 +318,7 @@ AST_TEST_DEFINE(pattern_match_test)
} }
cleanup: cleanup:
for (i = 0; i < ARRAY_LEN(contexts); ++i) { ast_context_destroy(NULL, registrar);
if (contexts[i].context) {
ast_context_destroy(contexts[i].context, registrar);
}
}
return res; return res;
} }

Write Preview
Loading…
Cancel
Save