[PATCH] libosmocore[master]: lapdm: Fix malformed Abis messages

[Harald Welte]

Hello Jenkins Builder, Holger Freyther,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/266

to look at the new patch set (#2).

lapdm: Fix malformed Abis messages

This commit relates to the bug #1635 that I have already reported
this March.

Related: #1635
Change-Id: Idbf43d4fdda6b2a6b4d8d15826735ce5f260ad89
---
M src/gsm/lapdm.c
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/266/2

diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index fa7769b..0e877e1 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -421,6 +421,11 @@
 		rll_msg = RSL_MT_EST_IND;
 		break;
 	case OSMO_PRIM(PRIM_DL_EST, PRIM_OP_CONFIRM):
+		if (dp->oph.msg && dp->oph.msg->len == 0) {
+			/* omit L3 info by freeing message */
+			msgb_free(dp->oph.msg);
+			dp->oph.msg = NULL;
+		}
 		rll_msg = RSL_MT_EST_CONF;
 		break;
 	case OSMO_PRIM(PRIM_DL_DATA, PRIM_OP_INDICATION):
@@ -429,9 +434,19 @@
 	case OSMO_PRIM(PRIM_DL_UNIT_DATA, PRIM_OP_INDICATION):
 		return send_rslms_rll_l3_ui(mctx, dp->oph.msg);
 	case OSMO_PRIM(PRIM_DL_REL, PRIM_OP_INDICATION):
+		if (dp->oph.msg && dp->oph.msg->len == 0) {
+			/* omit L3 info by freeing message */
+			msgb_free(dp->oph.msg);
+			dp->oph.msg = NULL;
+		}
 		rll_msg = RSL_MT_REL_IND;
 		break;
 	case OSMO_PRIM(PRIM_DL_REL, PRIM_OP_CONFIRM):
+		if (dp->oph.msg && dp->oph.msg->len == 0) {
+			/* omit L3 info by freeing message */
+			msgb_free(dp->oph.msg);
+			dp->oph.msg = NULL;
+		}
 		rll_msg = RSL_MT_REL_CONF;
 		break;
 	case OSMO_PRIM(PRIM_DL_SUSP, PRIM_OP_CONFIRM):

-- 
To view, visit https://gerrit.osmocom.org/266
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idbf43d4fdda6b2a6b4d8d15826735ce5f260ad89
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Minh-Quang Nguyen <minh-quang.nguyen at nutaq.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Minh-Quang Nguyen <minh-quang.nguyen at nutaq.com>