From: gitosis@osmocom.org Precedence: list To: osmocom-commitlog@lists.osmocom.org Date: Thu, 22 May 2014 14:47:03 GMT Message-ID: <201405221447.s4MEl3sI042008@git.osmocom.org> Subject: openbsc.git branch master updated. 0.13.0-391-g4f20049 Message: 5 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)". The branch, master has been updated via 4f200491ff217e48ebc10f31e85386899b63dbd8 (commit) via 1cc5ff8e19c840545ae746c52995d0768c2d1f70 (commit) via f259bd8359de61e9c8aa92c775b95665c1a143d5 (commit) via cab6e7528c475d6aee687001a6146e5f20d8f53d (commit) from 038f97a69fe58d2bcb6cabcb82b3485f7d622ed2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cgit.osmocom.org/openbsc/commit/?id=4f200491ff217e48ebc10f31e85386899b63dbd8 commit 4f200491ff217e48ebc10f31e85386899b63dbd8 Author: Holger Hans Peter Freyther Date: Thu May 22 15:23:22 2014 +0200 osmux: Fix potential memory leak in the msgb handling http://cgit.osmocom.org/openbsc/commit/?id=1cc5ff8e19c840545ae746c52995d0768c2d1f70 commit 1cc5ff8e19c840545ae746c52995d0768c2d1f70 Author: Holger Hans Peter Freyther Date: Thu May 22 15:03:10 2014 +0200 mgcp: Add proper length checking for line handling In ae1997248ccb4fba1394267d3051082dfd85448a the handwritten tokenizer was replaced with strtok_r. As part of this change the structural checking of MGCP parameters was stopped. This means that a code like "line + 3" might access beyond the first NUL and be possibly behind the msgb. Manually add size checking again. Manually jumping to the error label is not possible anymore as it has been removed. The result is that invalid lines will be skipped. This is matching the general approach by the IETF RFCs to be permissive in data being received. ----------------------------------------------------------------------- Summary of changes: openbsc/configure.ac | 1 + openbsc/include/openbsc/Makefile.am | 3 +- openbsc/include/openbsc/bsc_nat.h | 5 +- openbsc/include/openbsc/mgcp.h | 13 + openbsc/include/openbsc/mgcp_internal.h | 15 ++ openbsc/include/openbsc/osmux.h | 19 ++ openbsc/src/libmgcp/Makefile.am | 8 +- openbsc/src/libmgcp/mgcp_network.c | 50 ++-- openbsc/src/libmgcp/mgcp_protocol.c | 64 ++++- openbsc/src/libmgcp/mgcp_vty.c | 44 ++++ openbsc/src/libmgcp/osmux.c | 400 ++++++++++++++++++++++++++++++ openbsc/src/osmo-bsc_mgcp/Makefile.am | 3 +- openbsc/src/osmo-bsc_nat/Makefile.am | 5 +- openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 32 ++- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 19 ++ openbsc/tests/bsc-nat/Makefile.am | 4 +- openbsc/tests/bsc-nat/bsc_nat_test.c | 2 +- openbsc/tests/mgcp/Makefile.am | 2 +- openbsc/tests/mgcp/mgcp_test.c | 1 + 19 files changed, 642 insertions(+), 48 deletions(-) create mode 100644 openbsc/include/openbsc/osmux.h create mode 100644 openbsc/src/libmgcp/osmux.c hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)