<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21394">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts_ipaccess_nanobts: check if msgb_alloc fails<br><br>Change-Id: Ib7867fa29d62eeea2cbc5603b28e5b00d0f62222<br>---<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c<br>2 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 577be13..f9dc8b3 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -179,6 +179,8 @@</span><br><span> break;</span><br><span> if (new_state->availability == NM_AVSTATE_DEPENDENCY) {</span><br><span> msgb = nanobts_attr_nse_get(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr,</span><br><span> 0xff, 0xff, msgb->data,</span><br><span> msgb->len);</span><br><span>@@ -193,6 +195,8 @@</span><br><span> break;</span><br><span> if (new_state->availability == NM_AVSTATE_DEPENDENCY) {</span><br><span> msgb = nanobts_attr_cell_get(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr,</span><br><span> 0, 0xff, msgb->data,</span><br><span> msgb->len);</span><br><span>@@ -222,6 +226,8 @@</span><br><span> if ((new_state->availability == NM_AVSTATE_OFF_LINE) ||</span><br><span> (new_state->availability == NM_AVSTATE_DEPENDENCY)) {</span><br><span> msgb = nanobts_attr_nscv_get(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr,</span><br><span> nsvc->id, 0xff,</span><br><span> msgb->data, msgb->len);</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>index b723932..6d64a4b 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>@@ -32,6 +32,8 @@</span><br><span> uint8_t buf[256];</span><br><span> int rlt;</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> memcpy(buf, "\x55\x5b\x61\x67\x6d\x73", 6);</span><br><span> msgb_tv_fixed_put(msgb, NM_ATT_INTERF_BOUND, 6, buf);</span><br><span>@@ -104,6 +106,8 @@</span><br><span> struct msgb *msgb;</span><br><span> uint8_t buf[256];</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> /* NSEI 925 */</span><br><span> buf[0] = bts->gprs.nse.nsei >> 8;</span><br><span>@@ -140,6 +144,8 @@</span><br><span> struct msgb *msgb;</span><br><span> uint8_t buf[256];</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> /* routing area code */</span><br><span> buf[0] = bts->gprs.rac;</span><br><span>@@ -197,6 +203,8 @@</span><br><span> struct msgb *msgb;</span><br><span> uint8_t buf[256];</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> /* 925 */</span><br><span> buf[0] = bts->gprs.nsvc[0].nsvci >> 8;</span><br><span>@@ -240,6 +248,8 @@</span><br><span> struct msgb *msgb;</span><br><span> uint8_t buf[256];</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> /* number of -2dB reduction steps / Pn */</span><br><span> msgb_tv_put(msgb, NM_ATT_RF_MAXPOWR_R, trx->max_power_red / 2);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21394">change 21394</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/c/osmo-bsc/+/21394"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib7867fa29d62eeea2cbc5603b28e5b00d0f62222 </div>
<div style="display:none"> Gerrit-Change-Number: 21394 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>