<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22648">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_frgre: check iph/ip6h before passing them to rx functions<br><br>With IPv4 and IPv6 support it's not guaranteed that iph/ip6h is valid.<br><br>Related CID#214288<br><br>Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144<br>---<br>M src/gb/gprs_ns2_frgre.c<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index f163704..177aeb2 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -351,11 +351,17 @@</span><br><span> switch (osmo_ntohs(greh->ptype)) {</span><br><span> case GRE_PTYPE_IPv4:</span><br><span> /* IPv4 messages might be GRE keepalives */</span><br><span style="color: hsl(0, 100%, 40%);">- *error = handle_rx_gre_ipv4(bfd, msg, iph, greh);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iph)</span><br><span style="color: hsl(120, 100%, 40%);">+ *error = handle_rx_gre_ipv4(bfd, msg, iph, greh);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ *error = -EIO;</span><br><span> goto out_err;</span><br><span> break;</span><br><span> case GRE_PTYPE_IPv6:</span><br><span style="color: hsl(0, 100%, 40%);">- *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip6h)</span><br><span style="color: hsl(120, 100%, 40%);">+ *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ *error = -EIO;</span><br><span> goto out_err;</span><br><span> break;</span><br><span> case GRE_PTYPE_FR:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22648">change 22648</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/libosmocore/+/22648"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 </div>
<div style="display:none"> Gerrit-Change-Number: 22648 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>