<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21639">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: check for NULL of gprs_subscr_get_or_create()<br><br>gprs_subscr_get_or_create() can return NULL if no memory can<br>be allocated. Detected by the compiler on Ubuntu s390x.<br><br>Signed-off-by: Steve Langasek <steve.langasek@ubuntu.com><br>Signed-off-by: Alexander Couzens <lynxis@fe80.eu><br><br>Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082<br>---<br>M src/sgsn/gprs_subscriber.c<br>M src/sgsn/sgsn_vty.c<br>2 files changed, 10 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/21639/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c</span><br><span>index c23b332..943fbc3 100644</span><br><span>--- a/src/sgsn/gprs_subscriber.c</span><br><span>+++ b/src/sgsn/gprs_subscriber.c</span><br><span>@@ -870,6 +870,8 @@</span><br><span> </span><br><span>       if (!subscr) {</span><br><span>               subscr = gprs_subscr_get_or_create(mmctx->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+           if (!subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+                  return NULL;</span><br><span>                 subscr->flags |= GPRS_SUBSCRIBER_FIRST_CONTACT;</span><br><span>           subscr->flags &= ~GPRS_SUBSCRIBER_ENABLE_PURGE;</span><br><span>       }</span><br><span>@@ -893,6 +895,8 @@</span><br><span>      LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber data update\n");</span><br><span> </span><br><span>   subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+          return -ENOMEM;</span><br><span> </span><br><span>  subscr->flags |= GPRS_SUBSCRIBER_UPDATE_LOCATION_PENDING;</span><br><span> </span><br><span>@@ -918,6 +922,8 @@</span><br><span>       LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber authentication info\n");</span><br><span> </span><br><span>   subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+          return -ENOMEM;</span><br><span> </span><br><span>  subscr->flags |= GPRS_SUBSCRIBER_UPDATE_AUTH_INFO_PENDING;</span><br><span> </span><br><span>diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c</span><br><span>index 33a652c..56aa0c9 100644</span><br><span>--- a/src/sgsn/sgsn_vty.c</span><br><span>+++ b/src/sgsn/sgsn_vty.c</span><br><span>@@ -1020,6 +1020,10 @@</span><br><span>  }</span><br><span> </span><br><span>        subscr = gprs_subscr_get_or_create(imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (subscr) {</span><br><span style="color: hsl(120, 100%, 40%);">+         vty_out(vty, "Can not create subscriber. Out of memory.%s", imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+          return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span>    subscr->keep_in_ram = 1;</span><br><span>  gprs_subscr_put(subscr);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21639">change 21639</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-sgsn/+/21639"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082 </div>
<div style="display:none"> Gerrit-Change-Number: 21639 </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-MessageType: newchange </div>