<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13914">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handle NULL return of rate_ctr_group_alloc()<br><br>Change-Id: Ieadded9c088ef8f86164400a60ce542e3c868e9d<br>Related: OS#3701<br>---<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 24 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index af5426f..5300351 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Initialize rtp connection struct with default values */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+static int mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn)</span><br><span> {</span><br><span> struct mgcp_rtp_end *end = &conn_rtp->end;</span><br><span> /* FIXME: Each new rate counter group requires an unique index. At the</span><br><span>@@ -109,12 +109,17 @@</span><br><span> end->maximum_packet_time = -1;</span><br><span> </span><br><span> conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn_rtp->rate_ctr_group)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR];</span><br><span> conn_rtp->state.out_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[OUT_STREAM_ERR_TSTMP_CTR];</span><br><span> rate_ctr_index++;</span><br><span> </span><br><span> /* Make sure codec table is reset */</span><br><span> mgcp_codec_reset_all(conn_rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Cleanup rtp connection struct */</span><br><span>@@ -175,7 +180,10 @@</span><br><span> </span><br><span> switch (type) {</span><br><span> case MGCP_CONN_TYPE_RTP:</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_conn_init(&conn->u.rtp, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mgcp_rtp_conn_init(&conn->u.rtp, conn) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> default:</span><br><span> /* NOTE: This should never be called with an</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 3a4e396..807e34a 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -1496,7 +1496,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+static int alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)</span><br><span> {</span><br><span> /* FIXME: Each new rate counter group requires a unique index. At the</span><br><span> * moment we generate an index using a counter, but perhaps there is</span><br><span>@@ -1508,25 +1508,34 @@</span><br><span> </span><br><span> if (trunk->mgcp_crcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk->mgcp_crcx_ctr_group)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group);</span><br><span> crcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (trunk->mgcp_mdcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk->mgcp_mdcx_ctr_group)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group);</span><br><span> mdcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (trunk->mgcp_dlcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_dlcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk->mgcp_dlcx_ctr_group)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> talloc_set_destructor(trunk->mgcp_dlcx_ctr_group, free_rate_counter_group);</span><br><span> dlcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (trunk->all_rtp_conn_stats == NULL) {</span><br><span> trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc,</span><br><span> all_rtp_conn_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk->all_rtp_conn_stats)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group);</span><br><span> all_rtp_conn_rate_ctr_index++;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! allocate configuration with default values.</span><br><span>@@ -1566,7 +1575,10 @@</span><br><span> cfg->trunk.audio_send_name = 1;</span><br><span> cfg->trunk.omit_rtcp = 0;</span><br><span> mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(0, 100%, 40%);">- alloc_mgcp_rate_counters(&cfg->trunk, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (alloc_mgcp_rate_counters(&cfg->trunk, cfg) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> INIT_LLIST_HEAD(&cfg->trunks);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13914">change 13914</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13914"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ieadded9c088ef8f86164400a60ce542e3c868e9d </div>
<div style="display:none"> Gerrit-Change-Number: 13914 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>