<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22273">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: add assert on most bind calls<br><br>Add a OSMO_ASSERT to all bind calls which doesn't<br>check if the bind is from the expected type.<br>The only exception is rx and tx functions (hot path).<br><br>Change-Id: Ia4f8932263c60618c7f0dfc32d50ba5a8d57602b<br>---<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_udp.c<br>2 files changed, 19 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index c1bed6c..7b9450c 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -106,6 +106,7 @@</span><br><span> if (!nsvc->priv)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(nsvc->bind));</span><br><span> talloc_free(nsvc->priv);</span><br><span> nsvc->priv = NULL;</span><br><span> }</span><br><span>@@ -137,6 +138,7 @@</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> if (!bind)</span><br><span> return;</span><br><span> </span><br><span>@@ -158,6 +160,7 @@</span><br><span> if (!priv)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> nsvc->priv = priv;</span><br><span> priv->dlci = dlci;</span><br><span> priv->dlc = osmo_fr_dlc_alloc(privb->link, dlci);</span><br><span>@@ -180,6 +183,7 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *vcpriv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> if (!result)</span><br><span> return -EINVAL;</span><br><span> </span><br><span>@@ -740,6 +744,7 @@</span><br><span> struct priv_bind *bpriv = bind->priv;</span><br><span> char idbuf[64];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> nsvc = gprs_ns2_fr_nsvc_by_dlci(bind, dlci);</span><br><span> if (nsvc) {</span><br><span> goto err;</span><br><span>@@ -780,7 +785,10 @@</span><br><span> {</span><br><span> bool created_nse = false;</span><br><span> struct gprs_ns2_vc *nsvc = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> if (!nse) {</span><br><span> nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_FR, NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span> if (!nse)</span><br><span>@@ -812,6 +820,7 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *vcpriv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> llist_for_each_entry(nsvc, &bind->nsvc, blist) {</span><br><span> vcpriv = nsvc->priv;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index d93b66d..1037b19 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -63,6 +63,8 @@</span><br><span> if (!bind)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> priv = bind->priv;</span><br><span> </span><br><span> osmo_fd_close(&priv->fd);</span><br><span>@@ -74,6 +76,7 @@</span><br><span> if (!nsvc->priv)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(nsvc->bind));</span><br><span> talloc_free(nsvc->priv);</span><br><span> nsvc->priv = NULL;</span><br><span> }</span><br><span>@@ -116,6 +119,8 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *vcpriv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry(nsvc, &bind->nsvc, blist) {</span><br><span> vcpriv = nsvc->priv;</span><br><span> if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family)</span><br><span>@@ -397,6 +402,8 @@</span><br><span> char *sockaddr_str;</span><br><span> char idbuf[64];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vc_mode = gprs_ns2_dialect_to_vc_mode(nse->dialect);</span><br><span> if ((int) vc_mode == -1) {</span><br><span> LOGP(DLNS, LOGL_ERROR, "Can not derive vc mode from dialect %d. Maybe libosmocore is too old.\n",</span><br><span>@@ -492,6 +499,7 @@</span><br><span> const struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind)</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span> </span><br><span> priv = bind->priv;</span><br><span> return &priv->addr;</span><br><span>@@ -509,6 +517,7 @@</span><br><span> struct priv_bind *priv;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span> priv = bind->priv;</span><br><span> </span><br><span> if (dscp != priv->dscp) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22273">change 22273</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/+/22273"/><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: Ia4f8932263c60618c7f0dfc32d50ba5a8d57602b </div>
<div style="display:none"> Gerrit-Change-Number: 22273 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>