paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-03 05:23:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgcp-cli: Validate osmux cid value during mgcp_msg_gen

Browse Source 
Change-Id: I5c4d39b346b94de933f86200902c6c0ea2e1d5df
This commit is contained in:
Pau Espin Pedrol
2019-05-23 16:48:24 +02:00
parent df7d97e4b4
commit 1b1d7ed98f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libosmo-mgcp-client/mgcp_client.c
View File

@@ -36,6 +36,10 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#ifndef OSMUX_CID_MAX
#define OSMUX_CID_MAX 255 /* FIXME: use OSMUX_CID_MAX from libosmo-netif? */
#endif
/* Codec descripton for dynamic payload types (SDP) */ /* Codec descripton for dynamic payload types (SDP) */
const struct value_string osmo_mgcpc_codec_names[] = { const struct value_string osmo_mgcpc_codec_names[] = {
{ CODEC_PCMU_8000_1, "PCMU/8000/1" }, { CODEC_PCMU_8000_1, "PCMU/8000/1" },
@@ -414,9 +418,6 @@ static int mgcp_parse_osmux_cid(const char *line)
return -2; return -2;
} }
#ifndef OSMUX_CID_MAX
#define OSMUX_CID_MAX 255 /* FIXME: use OSMUX_CID_MAX from libosmo-netif? */
#endif
if (osmux_cid > OSMUX_CID_MAX) { /* OSMUX_CID_MAX from libosmo-netif */ if (osmux_cid > OSMUX_CID_MAX) { /* OSMUX_CID_MAX from libosmo-netif */
LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n", LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n",
osmux_cid, OSMUX_CID_MAX); osmux_cid, OSMUX_CID_MAX);
@@ -1260,6 +1261,13 @@ struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg)
/* Add X-Osmo-Osmux */ /* Add X-Osmo-Osmux */
if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID)) { if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID)) {
if (mgcp_msg->x_osmo_osmux_cid < -1 || mgcp_msg->x_osmo_osmux_cid > OSMUX_CID_MAX) {
LOGP(DLMGCP, LOGL_ERROR,
"Wrong Osmux CID %d, can not generate MGCP message\n",
mgcp_msg->x_osmo_osmux_cid);
msgb_free(msg);
return NULL;
}
snprintf(buf, sizeof(buf), " %d", mgcp_msg->x_osmo_osmux_cid); snprintf(buf, sizeof(buf), " %d", mgcp_msg->x_osmo_osmux_cid);
rc += rc +=
msgb_printf(msg, MGCP_X_OSMO_OSMUX_HEADER "%s\r\n", msgb_printf(msg, MGCP_X_OSMO_OSMUX_HEADER "%s\r\n",