kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audit improper usage of scheduler exposed by 5c713fdf18. (v13 additions)

Browse Source 
chan_sip.c:
* Initialize mwi subscription scheduler ids earlier because of ASTOBJ to
ao2 conversion.

* Initialize register scheduler ids earlier because of ASTOBJ to ao2
conversion.

chan_skinny.c:
* Fix more scheduler usage for the valid 0 id value.

ASTERISK-25476

Change-Id: If9f0e5d99638b2f9d102d1ebc9c5a14b2d706e95
This commit is contained in:
Richard Mudgett
2015-11-25 12:23:47 -06:00
parent 6d9156d10f
commit 4aed349a7b
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -9374,6 +9374,9 @@ static int sip_register(const char *value, int lineno)
return -1; return -1;
} }
reg->expire = -1;
reg->timeout = -1;
if (ast_string_field_init(reg, 256)) { if (ast_string_field_init(reg, 256)) {
ao2_t_ref(reg, -1, "failed to string_field_init, drop reg"); ao2_t_ref(reg, -1, "failed to string_field_init, drop reg");
return -1; return -1;
@@ -9447,6 +9450,8 @@ static int sip_subscribe_mwi(const char *value, int lineno)
return -1; return -1;
} }
mwi->resub = -1;
if (ast_string_field_init(mwi, 256)) { if (ast_string_field_init(mwi, 256)) {
ao2_t_ref(mwi, -1, "failed to string_field_init, drop mwi"); ao2_t_ref(mwi, -1, "failed to string_field_init, drop mwi");
return -1; return -1;
@@ -9461,7 +9466,6 @@ static int sip_subscribe_mwi(const char *value, int lineno)
} }
ast_string_field_set(mwi, hostname, hostname); ast_string_field_set(mwi, hostname, hostname);
ast_string_field_set(mwi, mailbox, mailbox); ast_string_field_set(mwi, mailbox, mailbox);
mwi->resub = -1;
mwi->portno = portnum; mwi->portno = portnum;
mwi->transport = transport; mwi->transport = transport;

33
channels/chan_skinny.c
View File

@@ -1364,6 +1364,12 @@ static int gendigittimeout = 8000;
/* How long to wait for an extra digit, if there is an ambiguous match */ /* How long to wait for an extra digit, if there is an ambiguous match */
static int matchdigittimeout = 3000; static int matchdigittimeout = 3000;
/*!
* To apease the stupid compiler option on ast_sched_del()
* since we don't care about the return value.
*/
static int not_used;
#define SUBSTATE_UNSET 0 #define SUBSTATE_UNSET 0
#define SUBSTATE_OFFHOOK 1 #define SUBSTATE_OFFHOOK 1
#define SUBSTATE_ONHOOK 2 #define SUBSTATE_ONHOOK 2
@@ -2262,10 +2268,10 @@ static int skinny_register(struct skinny_req *req, struct skinnysession *s)
int instance; int instance;
int res = -1; int res = -1;
if (s->auth_timeout_sched && ast_sched_del(sched, s->auth_timeout_sched)) { if (-1 < s->auth_timeout_sched) {
return 0; not_used = ast_sched_del(sched, s->auth_timeout_sched);
s->auth_timeout_sched = -1;
} }
s->auth_timeout_sched = 0;
AST_LIST_LOCK(&devices); AST_LIST_LOCK(&devices);
AST_LIST_TRAVERSE(&devices, d, list){ AST_LIST_TRAVERSE(&devices, d, list){
@@ -5571,6 +5577,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
sub->cfwd_sched = -1; sub->cfwd_sched = -1;
} else if (state == SUBSTATE_ONHOOK) { } else if (state == SUBSTATE_ONHOOK) {
skinny_sched_del(sub->cfwd_sched, sub); skinny_sched_del(sub->cfwd_sched, sub);
sub->cfwd_sched = -1;
} }
} }
@@ -6170,9 +6177,7 @@ static int handle_ip_port_message(struct skinny_req *req, struct skinnysession *
static void handle_keepalive_message(struct skinny_req *req, struct skinnysession *s) static void handle_keepalive_message(struct skinny_req *req, struct skinnysession *s)
{ {
if (ast_sched_del(sched, s->keepalive_timeout_sched)) { not_used = ast_sched_del(sched, s->keepalive_timeout_sched);
return;
}
#ifdef AST_DEVMODE #ifdef AST_DEVMODE
{ {
@@ -7415,7 +7420,7 @@ static int skinny_noauth_cb(const void *data)
{ {
struct skinnysession *s = (struct skinnysession *)data; struct skinnysession *s = (struct skinnysession *)data;
ast_log(LOG_WARNING, "Skinny Client failed to authenticate in %d seconds (SCHED %d)\n", auth_timeout, s->auth_timeout_sched); ast_log(LOG_WARNING, "Skinny Client failed to authenticate in %d seconds (SCHED %d)\n", auth_timeout, s->auth_timeout_sched);
s->auth_timeout_sched = 0; s->auth_timeout_sched = -1;
end_session(s); end_session(s);
return 0; return 0;
} }
@@ -7424,7 +7429,7 @@ static int skinny_nokeepalive_cb(const void *data)
{ {
struct skinnysession *s = (struct skinnysession *)data; struct skinnysession *s = (struct skinnysession *)data;
ast_log(LOG_WARNING, "Skinny Client failed to send keepalive in last %d seconds (SCHED %d)\n", keep_alive*3, s->keepalive_timeout_sched); ast_log(LOG_WARNING, "Skinny Client failed to send keepalive in last %d seconds (SCHED %d)\n", keep_alive*3, s->keepalive_timeout_sched);
s->keepalive_timeout_sched = 0; s->keepalive_timeout_sched = -1;
end_session(s); end_session(s);
return 0; return 0;
} }
@@ -7442,11 +7447,13 @@ static void skinny_session_cleanup(void *data)
ast_mutex_unlock(&s->lock); ast_mutex_unlock(&s->lock);
} }
if (s->auth_timeout_sched && !ast_sched_del(sched, s->auth_timeout_sched)) { if (-1 < s->auth_timeout_sched) {
s->auth_timeout_sched = 0; not_used = ast_sched_del(sched, s->auth_timeout_sched);
s->auth_timeout_sched = -1;
} }
if (s->keepalive_timeout_sched && !ast_sched_del(sched, s->keepalive_timeout_sched)) { if (-1 < s->keepalive_timeout_sched) {
s->keepalive_timeout_sched = 0; not_used = ast_sched_del(sched, s->keepalive_timeout_sched);
s->keepalive_timeout_sched = -1;
} }
if (d) { if (d) {
@@ -7651,6 +7658,8 @@ static void *accept_thread(void *ignore)
ast_mutex_init(&s->lock); ast_mutex_init(&s->lock);
memcpy(&s->sin, &sin, sizeof(sin)); memcpy(&s->sin, &sin, sizeof(sin));
s->fd = as; s->fd = as;
s->auth_timeout_sched = -1;
s->keepalive_timeout_sched = -1;
if (ast_pthread_create(&s->t, NULL, skinny_session, s)) { if (ast_pthread_create(&s->t, NULL, skinny_session, s)) {
destroy_session(s); destroy_session(s);