<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14146">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp-cli: Validate osmux cid value during mgcp_msg_gen<br><br>Change-Id: I5c4d39b346b94de933f86200902c6c0ea2e1d5df<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>1 file changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/46/14146/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 7074328..f2204e1 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -36,6 +36,10 @@</span><br><span> #include <unistd.h></span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef OSMUX_CID_MAX</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMUX_CID_MAX 255 /* FIXME: use OSMUX_CID_MAX from libosmo-netif? */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Codec descripton for dynamic payload types (SDP) */</span><br><span> const struct value_string osmo_mgcpc_codec_names[] = {</span><br><span>         { CODEC_PCMU_8000_1, "PCMU/8000/1" },</span><br><span>@@ -414,9 +418,6 @@</span><br><span>                return -2;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef OSMUX_CID_MAX</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMUX_CID_MAX 255 /* FIXME: use OSMUX_CID_MAX from libosmo-netif? */</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span>         if (osmux_cid > OSMUX_CID_MAX) { /* OSMUX_CID_MAX from libosmo-netif */</span><br><span>           LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n",</span><br><span>                    osmux_cid, OSMUX_CID_MAX);</span><br><span>@@ -1260,6 +1261,13 @@</span><br><span> </span><br><span>         /* Add X-Osmo-Osmux */</span><br><span>       if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               if (mgcp_msg->x_osmo_osmux_cid < -1 || mgcp_msg->x_osmo_osmux_cid > OSMUX_CID_MAX) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                           "Wrong Osmux CID %d, can not generate MGCP message\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                      mgcp_msg->x_osmo_osmux_cid);</span><br><span style="color: hsl(120, 100%, 40%);">+                  msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                       return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span>            snprintf(buf, sizeof(buf), " %d", mgcp_msg->x_osmo_osmux_cid);</span><br><span>          rc +=</span><br><span>                    msgb_printf(msg, MGCP_X_OSMO_OSMUX_HEADER "%s\r\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14146">change 14146</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/14146"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5c4d39b346b94de933f86200902c6c0ea2e1d5df </div>
<div style="display:none"> Gerrit-Change-Number: 14146 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>