<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> When tracing a faked reply (like 200 for CANCEL), the sip msg used to retrieve the tracing parameters is the transaction's uas one (uas.request) which might have the from header parsed or not, depending on the routing script actions (by default, if I'm not wrong, it is not parsed). If the header is not parsed, calling get_from in trace_onreply_out function will lead to a memory leak, beacause the header is parsed in pkg memory not freed when the transaction is deleted. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2295
-- Commit Summary --
* siptrace: siptrace: fix memory leak in fake replies tracing
-- File Changes --
M src/modules/siptrace/siptrace.c (12)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2295.patch https://github.com/kamailio/kamailio/pull/2295.diff
@miconda commented on this pull request.
@@ -1607,6 +1608,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps)
if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free iit at the end. + */ + if (msg->from && msg->from->parsed != NULL)
Should the above condition have:
``` msg->from->parsed == NULL ```
Otherwise it should be already parsed.
@miconda commented on this pull request.
}
sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) + free_from(msg->from->parsed);
At least for safety, probably `msg->from->parsed` should be set back to NULL, not to be freed again in other places.
@grumvalski commented on this pull request.
@@ -1607,6 +1608,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps)
if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free iit at the end. + */ + if (msg->from && msg->from->parsed != NULL)
you're right, I wrongly copied from local. I'm going to fix and force push.
@grumvalski pushed 1 commit.
ee7496f18b626a6c5dff10753db5b546759f6f7b siptrace: siptrace: fix memory leak in fake replies tracing
Looking at the function, I think two other `return` have to be replaced with `goto end`, lines 1619, 1665.
Thank you Daniel and, again, you are right, I was working on 5.3 branch and didn't realize the new sip_trace_msg_attrs function. I'm pushing a fix. This also means that the patch cannot be backported to 5.3 as it is.
@grumvalski pushed 1 commit.
f2e675876980c5c066a837fbd25c20594cfc64ea siptrace: free parsed from in case of errors
@miconda commented on this pull request.
@@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps)
}
if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; }
This one is in another function -- mistake?
@grumvalski pushed 1 commit.
0f461ee26fa72d1d2f4f6777f3e0d233619dc3fb siptrace: free parsed from in case of errors
@grumvalski commented on this pull request.
@@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps)
}
if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; }
sorry, definitely not my day today...
No worries, I had worse days. It is ok to merge. The patch doesn't look that big to be converted and applied for what 5.3 needs. Thanks.
Merged #2295 into master.
-
Daniel-Constantin Mierla -
Federico Cabiddu