From 16373a4e5fe95ba47a2e3382a0fdf9fcd424b39c Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 13 Aug 2007 20:20:43 +0000
Subject: [PATCH] Merged revisions 79276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79276 | russell | 2007-08-13 15:18:30 -0500 (Mon, 13 Aug 2007) | 4 lines
Release the pvt lock before calling find_peer in register_verify to avoid a
deadlock. Also, remove some unnecessary locking in auth_fail that was only done
recursively.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_iax2.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 8cabad2cfb..50de9e23df 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5339,10 +5339,11 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
}
/* SLD: first call to lookup peer during registration */
+ ast_mutex_unlock(&iaxsl[callno]);
p = find_peer(peer, 1);
-
- if (!p) {
- if (authdebug)
+ ast_mutex_lock(&iaxsl[callno]);
+ if (!p || !iaxs[callno]) {
+ if (authdebug && !p)
ast_log(LOG_NOTICE, "No registration for peer '%s' (from %s)\n", peer, ast_inet_ntoa(sin->sin_addr));
return -1;
}
@@ -5449,8 +5450,8 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
if (ast_test_flag(p, IAX_TEMPONLY))
destroy_peer(p);
+
return 0;
-
}
static int authenticate(const char *challenge, const char *secret, const char *keyn, int authmethods, struct iax_ie_data *ied, struct sockaddr_in *sin, ast_aes_encrypt_key *ecx, ast_aes_decrypt_key *dcx)
@@ -6242,7 +6243,6 @@ static int auth_fail(int callno, int failcode)
{
/* Schedule sending the authentication failure in one second, to prevent
guessing */
- ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) {
iaxs[callno]->authfail = failcode;
if (delayreject) {
@@ -6252,7 +6252,6 @@ static int auth_fail(int callno, int failcode)
} else
auth_reject((void *)(long)callno);
}
- ast_mutex_unlock(&iaxsl[callno]);
return 0;
}
@@ -8143,10 +8142,18 @@ retryowner2:
if (delayreject)
send_command_immediate(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACK, fr->ts, NULL, 0,fr->iseqno);
if (register_verify(fr->callno, &sin, &ies)) {
+ if (!iaxs[fr->callno]) {
+ ast_mutex_unlock(&iaxsl[fr->callno]);
+ return 1;
+ }
/* Send delayed failure */
auth_fail(fr->callno, IAX_COMMAND_REGREJ);
break;
}
+ if (!iaxs[fr->callno]) {
+ ast_mutex_unlock(&iaxsl[fr->callno]);
+ return 1;
+ }
if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) ||
ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED)) {
if (f.subclass == IAX_COMMAND_REGREL)
--
GitLab