<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/25934">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory<br><br>If the remote ESME would send us 0xffffffff as length field, don't try<br>to allocte 4GB of memory, but bail out.<br><br>Change-Id: I561f75210811826de06ea1673eca1df24faaa210<br>Fixes: CID#240738<br>---<br>M src/utils/smpp_mirror.c<br>1 file changed, 5 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c</span><br><span>index 883c498..72d15e3 100644</span><br><span>--- a/src/utils/smpp_mirror.c</span><br><span>+++ b/src/utils/smpp_mirror.c</span><br><span>@@ -246,6 +246,10 @@</span><br><span>                     esme->read_idx += rc;</span><br><span>             if (esme->read_idx >= sizeof(uint32_t)) {</span><br><span>                      esme->read_len = ntohl(len);</span><br><span style="color: hsl(120, 100%, 40%);">+                       if (esme->read_len > 65535) {</span><br><span style="color: hsl(120, 100%, 40%);">+                           /* unrealistic */</span><br><span style="color: hsl(120, 100%, 40%);">+                             goto dead_socket;</span><br><span style="color: hsl(120, 100%, 40%);">+                     }</span><br><span>                    msg = msgb_alloc(esme->read_len, "SMPP Rx");</span><br><span>                    if (!msg)</span><br><span>                            return -ENOMEM;</span><br><span>@@ -283,6 +287,7 @@</span><br><span>        osmo_fd_unregister(&esme->wqueue.bfd);</span><br><span>        close(esme->wqueue.bfd.fd);</span><br><span>       esme->wqueue.bfd.fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+  esme_read_state_reset(esme);</span><br><span>         exit(2342);</span><br><span> </span><br><span>      return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/25934">change 25934</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-msc/+/25934"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 </div>
<div style="display:none"> Gerrit-Change-Number: 25934 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>