diff options
| author | Steve Davies <steve@one47.co.uk> | 2015-04-28 11:38:30 +0100 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2015-04-28 06:57:44 -0500 |
| commit | 5e9658482926041708c54c3916443ba4da477e3f (patch) | |
| tree | 78c29b351c44a6082db6ab472ca126583f1abffa /res | |
| parent | b2153f1f498cb57571e7587ef241ddd86ba167ad (diff) | |
res_rtp_asterisk: Resolve 2 discrete memory leaks in DTLS
ao2 ref leak in res_rtp_asterisk.c when a DTLS policy is created.
The resources are linked into a table, but the original alloc refs
are never released. ast_strdup leak in rtp_engine.c. If
ast_rtp_dtls_cfg_copy() is called twice on the same destination struct,
a pointer to an alloc'd string is overwritten before the string is free'd.
ASTERISK-25022
Reported by: one47
Change-Id: I62a8ceb8679709f6c3769136dc6aa9a68202ff9b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_rtp_asterisk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 0513c1127..62601dcad 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1869,6 +1869,7 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as unsigned char *local_key, *local_salt, *remote_key, *remote_salt; struct ast_srtp_policy *local_policy, *remote_policy = NULL; struct ast_rtp_instance_stats stats = { 0, }; + int res = -1; /* If a fingerprint is present in the SDP make sure that the peer certificate matches it */ if (rtp->dtls_verify & AST_RTP_DTLS_VERIFY_FINGERPRINT) { @@ -1983,16 +1984,17 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as } } - return 0; + res = 0; error: + /* policy->destroy() called even on success to release local reference to these resources */ res_srtp_policy->destroy(local_policy); if (remote_policy) { res_srtp_policy->destroy(remote_policy); } - return -1; + return res; } #endif |