<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22273">View Change</a></p><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, 21 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/22273/1</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 2c797f3..c897cbc 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>@@ -738,6 +742,7 @@</span><br><span> struct gprs_ns2_vc *nsvc = NULL;</span><br><span> struct priv_vc *priv = 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 = gprs_ns2_fr_nsvc_by_dlci(bind, dlci);</span><br><span> if (nsvc) {</span><br><span> goto err;</span><br><span>@@ -777,7 +782,10 @@</span><br><span> bool created_nse = false;</span><br><span> struct gprs_ns2_vc *nsvc = NULL;</span><br><span> struct priv_vc *priv = 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>@@ -823,8 +831,9 @@</span><br><span> uint16_t dlci)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct priv_vc *vcpriv;</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 370937f..2a2886a 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>@@ -277,7 +282,7 @@</span><br><span> const struct osmo_sockaddr *local;</span><br><span> </span><br><span> OSMO_ASSERT(nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(sockaddr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sockaddr); </span><br><span> </span><br><span> llist_for_each_entry(bind, &nsi->binding, list) {</span><br><span> if (!gprs_ns2_is_ip_bind(bind))</span><br><span>@@ -395,6 +400,8 @@</span><br><span> struct priv_vc *priv;</span><br><span> enum gprs_ns2_vc_mode vc_mode;</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>@@ -486,6 +493,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>@@ -503,6 +511,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: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>