[asterisk-commits] chan sip: Fix crash involving the bogus peer during sip reload. (asterisk[11])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Dec 7 12:41:10 CST 2015
Matt Jordan has submitted this change and it was merged.
Change subject: chan_sip: Fix crash involving the bogus peer during sip reload.
......................................................................
chan_sip: Fix crash involving the bogus peer during sip reload.
A crash happens sometimes when performing a CLI "sip reload". The bogus
peer gets refreshed while it is in use by a new call which can cause the
crash.
* Protected the global bogus peer object with an ao2 global object
container.
ASTERISK-25610 #close
Change-Id: I5b528c742195681abcf713c6e1011ea65354eeed
---
M channels/chan_sip.c
1 file changed, 21 insertions(+), 13 deletions(-)
Approvals:
Anonymous Coward #1000019: Verified
Matt Jordan: Looks good to me, approved
Joshua Colp: Looks good to me, but someone else must approve
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 912c943..5c28cf2 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1179,9 +1179,9 @@
static struct ao2_container *peers;
static struct ao2_container *peers_by_ip;
-/*! \brief A bogus peer, to be used when authentication should fail */
-static struct sip_peer *bogus_peer;
-/*! \brief We can recognise the bogus peer by this invalid MD5 hash */
+/*! \brief A bogus peer, to be used when authentication should fail */
+static AO2_GLOBAL_OBJ_STATIC(g_bogus_peer);
+/*! \brief We can recognize the bogus peer by this invalid MD5 hash */
#define BOGUS_PEER_MD5SECRET "intentionally_invalid_md5_string"
/*! \brief The register list: Other SIP proxies we register with and receive calls from */
@@ -17026,8 +17026,7 @@
/* If we don't want username disclosure, use the bogus_peer when a user
* is not found. */
if (!peer && sip_cfg.alwaysauthreject && sip_cfg.autocreatepeer == AUTOPEERS_DISABLED) {
- peer = bogus_peer;
- sip_ref_peer(peer, "register_verify: ref the bogus_peer");
+ peer = ao2_t_global_obj_ref(g_bogus_peer, "register_verify: Get the bogus peer.");
}
if (!(peer && ast_apply_acl(peer->acl, addr, "SIP Peer ACL: "))) {
@@ -18217,6 +18216,7 @@
enum check_auth_result res;
int debug = sip_debug_test_addr(addr);
struct sip_peer *peer;
+ struct sip_peer *bogus_peer;
if (sipmethod == SIP_SUBSCRIBE) {
/* For subscribes, match on device name only; for other methods,
@@ -18256,8 +18256,13 @@
/* If you do mind, we use a peer that will never authenticate.
* This ensures that we follow the same code path as regular
* auth: less chance for username disclosure. */
- peer = bogus_peer;
- sip_ref_peer(peer, "sip_ref_peer: check_peer_ok: must ref bogus_peer so unreffing it does not fail");
+ peer = ao2_t_global_obj_ref(g_bogus_peer, "check_peer_ok: Get the bogus peer.");
+ if (!peer) {
+ return AUTH_DONT_KNOW;
+ }
+ bogus_peer = peer;
+ } else {
+ bogus_peer = NULL;
}
/* build_peer, called through sip_find_peer, is not able to check the
@@ -33585,7 +33590,7 @@
/*! \brief Force reload of module from cli */
static char *sip_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- static struct sip_peer *tmp_peer, *new_peer;
+ static struct sip_peer *new_peer;
switch (cmd) {
case CLI_INIT:
@@ -33608,13 +33613,13 @@
ast_mutex_unlock(&sip_reload_lock);
restart_monitor();
- tmp_peer = bogus_peer;
/* Create new bogus peer possibly with new global settings. */
if ((new_peer = temp_peer("(bogus_peer)"))) {
ast_string_field_set(new_peer, md5secret, BOGUS_PEER_MD5SECRET);
ast_clear_flag(&new_peer->flags[0], SIP_INSECURE);
- bogus_peer = new_peer;
- ao2_t_ref(tmp_peer, -1, "unref the old bogus_peer during reload");
+ ao2_t_global_obj_replace_unref(g_bogus_peer, new_peer,
+ "Replacing the old bogus peer during reload.");
+ ao2_t_ref(new_peer, -1, "done with new_peer");
} else {
ast_log(LOG_ERROR, "Could not update the fake authentication peer.\n");
/* You probably have bigger (memory?) issues to worry about though.. */
@@ -34788,6 +34793,8 @@
/*! \brief PBX load module - initialization */
static int load_module(void)
{
+ struct sip_peer *bogus_peer;
+
ast_verbose("SIP channel loading...\n");
if (!(sip_tech.capabilities = ast_format_cap_alloc())) {
@@ -34848,6 +34855,8 @@
/* Make sure the auth will always fail. */
ast_string_field_set(bogus_peer, md5secret, BOGUS_PEER_MD5SECRET);
ast_clear_flag(&bogus_peer->flags[0], SIP_INSECURE);
+ ao2_t_global_obj_replace_unref(g_bogus_peer, bogus_peer, "Set the initial bogus peer.");
+ ao2_t_ref(bogus_peer, -1, "Module load is done with the bogus peer.");
/* Prepare the version that does not require DTMF BEGIN frames.
* We need to use tricks such as memcpy and casts because the variable
@@ -34864,7 +34873,6 @@
/* Make sure we can register our sip channel type */
if (ast_channel_register(&sip_tech)) {
ast_log(LOG_ERROR, "Unable to register channel type 'SIP'\n");
- ao2_t_ref(bogus_peer, -1, "unref the bogus_peer");
io_context_destroy(io);
ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_FAILURE;
@@ -35130,7 +35138,7 @@
ast_debug(2, "TCP/TLS thread container did not become empty :(\n");
}
- ao2_t_ref(bogus_peer, -1, "unref the bogus_peer");
+ ao2_t_global_obj_release(g_bogus_peer, "Release the bogus peer.");
ao2_t_ref(peers, -1, "unref the peers table");
ao2_t_ref(peers_by_ip, -1, "unref the peers_by_ip table");
--
To view, visit https://gerrit.asterisk.org/1764
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b528c742195681abcf713c6e1011ea65354eeed
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>
More information about the asterisk-commits
mailing list