<p>daniel <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11889">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Fix abort during APN patch<br><br>gbproxy process was aborted with following message during APN patching:<br><000e> gb_proxy_patch.c:129 Patching ACT_PDP_REQ to SGSN: Replacing APN 'foo' -> 'bar'<br>msgb(0x5555558797d0): Sub area is not fully contained in the msg data<br><br>During osmo-sgsn 107fb59e84b12bbf6bdfdd4fc241dbcda7332706 old copy of<br>gprs_msgb_resize_area was replaced by more modern libosmocore version<br>called msgb_resize_area. They are mostly identical but the later has<br>some extra verification asserts. One of this asserts was triggering the<br>process abort, but the bug has always been there as far as I could see<br>in git history.<br><br>The assert triggers because the bssgp buffer and parse_ctx point to<br>"stored_msg", while the data buffer comes from a different msbg "msg",<br>which is clearly wrong behavior.<br><br>In the modified line, "msg" (the one which provided the imsi now already<br>stored in link_info through gbproxy_update_link_state_ul()->gbproxy_assign_imsi())<br>is really not needed anymore, and we want to patch the stored msg going<br>to be forwarded.<br><br>Related: SYS#4397<br>Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c<br>---<br>M src/gprs/gb_proxy.c<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c</span><br><span>index fe6a6c6..85c3c47 100644</span><br><span>--- a/src/gprs/gb_proxy.c</span><br><span>+++ b/src/gprs/gb_proxy.c</span><br><span>@@ -348,7 +348,7 @@</span><br><span>            gprs_gb_parse_bssgp(msgb_bssgph(stored_msg),</span><br><span>                                     msgb_bssgp_len(stored_msg),</span><br><span>                                  &tmp_parse_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-                gbproxy_patch_bssgp(msg, msgb_bssgph(stored_msg),</span><br><span style="color: hsl(120, 100%, 40%);">+             gbproxy_patch_bssgp(stored_msg, msgb_bssgph(stored_msg),</span><br><span>                                 msgb_bssgp_len(stored_msg),</span><br><span>                                  peer, link_info, &len_change,</span><br><span>                                    &tmp_parse_ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11889">change 11889</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/11889"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c </div>
<div style="display:none"> Gerrit-Change-Number: 11889 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </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>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>