Skip to content

dialog: fix use-after-free and race in cluster replication #3860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NormB wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −15
Open

dialog: fix use-after-free and race in cluster replication #3860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/dialog/dlg_db_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static inline void strip_esc(str *s)
int len = s->len;

for ( ; len > 0; len--, c++) {
if (*c == '\\' &&
if (len > 1 && *c == '\\' &&
(*(c+1)=='\\' || *(c+1)=='#' || *(c+1)=='|')) {
memmove(c, c + 1, len - 1);
s->len--;
Expand Down Expand Up @@ -1323,9 +1323,7 @@ str* write_dialog_vars( struct dlg_cell *dlg)
o_l = l;
}

lock_stop_read(dlg->vals_lock);

/* write the stuff into it */
/* write the stuff into it (still under read lock) */
o.len = l;
p = o.s;
for ( v=dlg->vals ; v ; v=v->next) {
Expand All @@ -1334,8 +1332,10 @@ str* write_dialog_vars( struct dlg_cell *dlg)
if (o.len!=p-o.s) {
LM_CRIT("BUG - buffer overflow allocated %d, written %d\n",
o.len,(int)(p-o.s));
lock_stop_read(dlg->vals_lock);
return NULL;
}
lock_stop_read(dlg->vals_lock);
LM_DBG("var string is <%.*s>(%d)\n", l,o.s,l);

return &o;
Expand Down
31 changes: 20 additions & 11 deletions modules/dialog/dlg_replication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,24 +300,24 @@ int dlg_replicated_create(bin_packet_t *packet, struct dlg_cell *cell,
/* link the dialog into the hash */
_link_dlg_unsafe(d_entry, dlg);

DLG_BIN_POP(str, packet, vars, pre_linking_error);
DLG_BIN_POP(str, packet, profiles, pre_linking_error);
DLG_BIN_POP(int, packet, dlg->user_flags, pre_linking_error);
DLG_BIN_POP(int, packet, dlg->mod_flags, pre_linking_error);
DLG_BIN_POP(str, packet, vars, post_linking_error);
DLG_BIN_POP(str, packet, profiles, post_linking_error);
DLG_BIN_POP(int, packet, dlg->user_flags, post_linking_error);
DLG_BIN_POP(int, packet, dlg->mod_flags, post_linking_error);

DLG_BIN_POP(int, packet, dlg->flags, pre_linking_error);
DLG_BIN_POP(int, packet, dlg->flags, post_linking_error);
/* also save the dialog into the DB on this instance */
dlg->flags |= DLG_FLAG_NEW;

DLG_BIN_POP(int, packet, dlg->tl.timeout, pre_linking_error);
DLG_BIN_POP(int, packet, dlg->tl.timeout, post_linking_error);
DLG_BIN_POP(int, packet, dlg->legs[DLG_CALLER_LEG].last_gen_cseq,
pre_linking_error);
post_linking_error);
DLG_BIN_POP(int, packet, dlg->legs[callee_idx(dlg)].last_gen_cseq,
pre_linking_error);
post_linking_error);

DLG_BIN_POP_ROUTE( packet, dlg, on_answer, pre_linking_error);
DLG_BIN_POP_ROUTE( packet, dlg, on_timeout, pre_linking_error);
DLG_BIN_POP_ROUTE( packet, dlg, on_hangup, pre_linking_error);
DLG_BIN_POP_ROUTE( packet, dlg, on_answer, post_linking_error);
DLG_BIN_POP_ROUTE( packet, dlg, on_timeout, post_linking_error);
DLG_BIN_POP_ROUTE( packet, dlg, on_hangup, post_linking_error);

if (dlg->tl.timeout <= (unsigned int)(unsigned long) time(0))
dlg->tl.timeout = 0;
Expand Down Expand Up @@ -411,6 +411,15 @@ int dlg_replicated_create(bin_packet_t *packet, struct dlg_cell *cell,
unref_dlg(dlg, 1);
return 0;


post_linking_error:
/* dialog was linked but not yet timer-inserted or ref-bumped */
unlink_unsafe_dlg(d_entry, dlg);
dlg_unlock(d_table, d_entry);
if (dlg)
destroy_dlg(dlg);
return -1;

pre_linking_error:
dlg_unlock(d_table, d_entry);
if (dlg)
Expand Down
Loading