Consistently check for minimum attribute/TLV length in RSL and OML

Make more use of TLVP_PRES_LEN() instead of plain TLVP_PRESENT() and
implicitly assuming a certain length of the information element.

What this obviously doesn't introduce is some kind of error
generation/reporting in case the minimum length is not fulfilled.  An IE
that's too small is silently ignored by TLVP_PRES_LEN() and treated as
if the IE wouldn't exist in the first place.

Change-Id: If5c4eee65711c49bc8ba4675221b1d5fd16198e9

5 files changed, 32 insertions, 34 deletions

diff --git a/src/common/oml.c b/src/common/oml.c
index 3f0f2384..290c3458 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -521,7 +521,7 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 	}
 
 	/* Test for globally unsupported stuff here */
-	if (TLVP_PRESENT(&tp, NM_ATT_BCCH_ARFCN)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_BCCH_ARFCN, 2)) {
 		uint16_t arfcn = ntohs(tlvp_val16_unal(&tp, NM_ATT_BCCH_ARFCN));
 		if (arfcn > 1024) {
 			oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_WARN_SW_WARN,
@@ -557,7 +557,7 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 	/* ... and actually still parse them */
 
 	/* 9.4.25 Interference Level Boundaries */
-	if (TLVP_PRESENT(&tp, NM_ATT_INTERF_BOUND)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_INTERF_BOUND, 6)) {
 		payload = TLVP_VAL(&tp, NM_ATT_INTERF_BOUND);
 		for (i = 0; i < 6; i++) {
 			int16_t boundary = *payload;
@@ -565,11 +565,11 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 		}
 	}
 	/* 9.4.24 Intave Parameter */
-	if (TLVP_PRESENT(&tp, NM_ATT_INTAVE_PARAM))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_INTAVE_PARAM, 1))
 		btsb->interference.intave = *TLVP_VAL(&tp, NM_ATT_INTAVE_PARAM);
 
 	/* 9.4.14 Connection Failure Criterion */
-	if (TLVP_PRESENT(&tp, NM_ATT_CONN_FAIL_CRIT)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_CONN_FAIL_CRIT, 1)) {
 		const uint8_t *val = TLVP_VAL(&tp, NM_ATT_CONN_FAIL_CRIT);
 
 		if (TLVP_LEN(&tp, NM_ATT_CONN_FAIL_CRIT) < 2
@@ -585,7 +585,7 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 	 * be parsed by bts driver */
 
 	/* 9.4.53 T200 */
-	if (TLVP_PRESENT(&tp, NM_ATT_T200)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_T200, ARRAY_SIZE(btsb->t200_ms))) {
 		payload = TLVP_VAL(&tp, NM_ATT_T200);
 		for (i = 0; i < ARRAY_SIZE(btsb->t200_ms); i++) {
 			uint32_t t200_ms = payload[i] * abis_nm_t200_ms[i];
@@ -607,35 +607,35 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 	}
 
 	/* 9.4.31 Maximum Timing Advance */
-	if (TLVP_PRESENT(&tp, NM_ATT_MAX_TA))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_MAX_TA, 1))
 		btsb->max_ta = *TLVP_VAL(&tp, NM_ATT_MAX_TA);
 
 	/* 9.4.39 Overload Period */
-	if (TLVP_PRESENT(&tp, NM_ATT_OVERL_PERIOD))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_OVERL_PERIOD, 1))
 		btsb->load.overload_period = *TLVP_VAL(&tp, NM_ATT_OVERL_PERIOD);
 
 	/* 9.4.12 CCCH Load Threshold */
-	if (TLVP_PRESENT(&tp, NM_ATT_CCCH_L_T))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_CCCH_L_T, 1))
 		btsb->load.ccch.load_ind_thresh = *TLVP_VAL(&tp, NM_ATT_CCCH_L_T);
 
 	/* 9.4.11 CCCH Load Indication Period */
-	if (TLVP_PRESENT(&tp, NM_ATT_CCCH_L_I_P))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_CCCH_L_I_P, 1))
 		btsb->load.ccch.load_ind_period = *TLVP_VAL(&tp, NM_ATT_CCCH_L_I_P);
 
 	/* 9.4.44 RACH Busy Threshold */
-	if (TLVP_PRESENT(&tp, NM_ATT_RACH_B_THRESH)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_RACH_B_THRESH, 1)) {
 		int16_t thresh = *TLVP_VAL(&tp, NM_ATT_RACH_B_THRESH);
 		btsb->load.rach.busy_thresh = -1 * thresh;
 	}
 
 	/* 9.4.45 RACH Load Averaging Slots */
-	if (TLVP_PRESENT(&tp, NM_ATT_LDAVG_SLOTS)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_LDAVG_SLOTS, 2)) {
 		btsb->load.rach.averaging_slots =
 			ntohs(tlvp_val16_unal(&tp, NM_ATT_LDAVG_SLOTS));
 	}
 
 	/* 9.4.10 BTS Air Timer */
-	if (TLVP_PRESENT(&tp, NM_ATT_BTS_AIR_TIMER)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_BTS_AIR_TIMER, 1)) {
 		uint8_t t3105 = *TLVP_VAL(&tp, NM_ATT_BTS_AIR_TIMER);
 		if (t3105 == 0) {
 			LOGP(DOML, LOGL_NOTICE,
@@ -646,15 +646,15 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
 	}
 
 	/* 9.4.37 NY1 */
-	if (TLVP_PRESENT(&tp, NM_ATT_NY1))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_NY1, 1))
 		btsb->ny1 = *TLVP_VAL(&tp, NM_ATT_NY1);
 	
 	/* 9.4.8 BCCH ARFCN */
-	if (TLVP_PRESENT(&tp, NM_ATT_BCCH_ARFCN))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_BCCH_ARFCN, 2))
 		bts->c0->arfcn = ntohs(tlvp_val16_unal(&tp, NM_ATT_BCCH_ARFCN));
 
 	/* 9.4.9 BSIC */
-	if (TLVP_PRESENT(&tp, NM_ATT_BSIC))
+	if (TLVP_PRES_LEN(&tp, NM_ATT_BSIC, 1))
 		bts->bsic = *TLVP_VAL(&tp, NM_ATT_BSIC);
 
 	/* call into BTS driver to apply new attributes to hardware */
@@ -697,7 +697,7 @@ static int oml_rx_set_radio_attr(struct gsm_bts_trx *trx, struct msgb *msg)
 	/* ... and actually still parse them */
 
 	/* 9.4.47 RF Max Power Reduction */
-	if (TLVP_PRESENT(&tp, NM_ATT_RF_MAXPOWR_R)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_RF_MAXPOWR_R, 1)) {
 		trx->max_power_red = *TLVP_VAL(&tp, NM_ATT_RF_MAXPOWR_R) * 2;
 		LOGP(DOML, LOGL_INFO, "Set RF Max Power Reduction = %d dBm\n",
 		     trx->max_power_red);
@@ -882,7 +882,7 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
 	ts->mo.nm_attr = tp_merged;
 
 	/* 9.4.13 Channel Combination */
-	if (TLVP_PRESENT(&tp, NM_ATT_CHAN_COMB)) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_CHAN_COMB, 1)) {
 		uint8_t comb = *TLVP_VAL(&tp, NM_ATT_CHAN_COMB);
 		ts->pchan = abis_nm_pchan4chcomb(comb);
 		rc = conf_lchans(ts);
@@ -896,7 +896,7 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
 	/* 9.4.5 ARFCN List */
 
 	/* 9.4.60 TSC */
-	if (TLVP_PRESENT(&tp, NM_ATT_TSC) && TLVP_LEN(&tp, NM_ATT_TSC) >= 1) {
+	if (TLVP_PRES_LEN(&tp, NM_ATT_TSC, 1)) {
 		ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC);
 	} else {
 		/* If there is no TSC specified, use the BCC */
@@ -1252,13 +1252,13 @@ static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg,
 
 	uint8_t stream_id = 0;
 
-	if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) {
+	if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) {
 		ip = ntohl(tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP));
 	}
-	if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) {
+	if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) {
 		port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT));
 	}
-	if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) {
+	if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) {
 		stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID);
 	}
 
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 51d23d63..0f2b6718 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -398,7 +398,7 @@ static int rsl_rx_paging_cmd(struct gsm_bts_trx *trx, struct msgb *msg)
 	paging_group = *TLVP_VAL(&tp, RSL_IE_PAGING_GROUP);
 	identity_lv = TLVP_VAL(&tp, RSL_IE_MS_IDENTITY)-1;
 
-	if (TLVP_PRESENT(&tp, RSL_IE_CHAN_NEEDED))
+	if (TLVP_PRES_LEN(&tp, RSL_IE_CHAN_NEEDED, 1))
 		chan_needed = *TLVP_VAL(&tp, RSL_IE_CHAN_NEEDED);
 
 	rc = paging_add_identity(btsb->paging_state, paging_group,
@@ -875,22 +875,22 @@ static int rsl_rx_chan_activ(struct msgb *msg)
 	/* 9.3.9 Handover Reference */
 	if ((type == RSL_ACT_INTER_ASYNC ||
 	     type == RSL_ACT_INTER_SYNC) &&
-	    TLVP_PRESENT(&tp, RSL_IE_HANDO_REF)) {
+	    TLVP_PRES_LEN(&tp, RSL_IE_HANDO_REF, 1)) {
 		lchan->ho.active = HANDOVER_ENABLED;
 		lchan->ho.ref = *TLVP_VAL(&tp, RSL_IE_HANDO_REF);
 	}
 
 	/* 9.3.4 BS Power */
-	if (TLVP_PRESENT(&tp, RSL_IE_BS_POWER))
+	if (TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1))
 		lchan->bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER);
 	/* 9.3.13 MS Power */
-	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER)) {
+	if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {
 		lchan->ms_power = *TLVP_VAL(&tp, RSL_IE_MS_POWER);
 		lchan->ms_power_ctrl.current = lchan->ms_power;
 		lchan->ms_power_ctrl.fixed = 0;
 	}
 	/* 9.3.24 Timing Advance */
-	if (TLVP_PRESENT(&tp, RSL_IE_TIMING_ADVANCE))
+	if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1))
 		lchan->rqd_ta = *TLVP_VAL(&tp, RSL_IE_TIMING_ADVANCE);
 
 	/* 9.3.32 BS Power Parameters */
@@ -1308,7 +1308,7 @@ static int rsl_rx_ms_pwr_ctrl(struct msgb *msg)
 	struct tlv_parsed tp;
 
 	rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
-	if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER)) {
+	if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {
 		uint8_t pwr = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;
 		lchan->ms_power_ctrl.fixed = 1;
 		lchan->ms_power_ctrl.current = pwr;
@@ -1607,14 +1607,14 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
 		return tx_ipac_XXcx_nack(lchan, RSL_ERR_MAND_IE_ERROR,
 					 0, dch->c.msg_type);
 
-	if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_IP)) {
+	if (TLVP_PRES_LEN(&tp, RSL_IE_IPAC_REMOTE_IP, 4)) {
 		connect_ip = tlvp_val32_unal(&tp, RSL_IE_IPAC_REMOTE_IP);
 		LOGP(DRSL, LOGL_NOTICE, "connect_ip %d \n", connect_ip );
 	}
 	else
 		LOGP(DRSL, LOGL_NOTICE, "CRCX does not specify a remote IP\n");
 
-	if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_PORT)) {
+	if (TLVP_PRES_LEN(&tp, RSL_IE_IPAC_REMOTE_PORT, 2)) {
 		connect_port = tlvp_val16_unal(&tp, RSL_IE_IPAC_REMOTE_PORT);
 		LOGP(DRSL, LOGL_NOTICE, "connect_port %d \n", connect_port );
 	}
diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c
index 64c868cb..5c53feb1 100644
--- a/src/osmo-bts-litecell15/oml.c
+++ b/src/osmo-bts-litecell15/oml.c
@@ -1696,8 +1696,7 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
 		/* our L1 only supports one global TSC for all channels
 		 * one one TRX, so we need to make sure not to activate
 		 * channels with a different TSC!! */
-		if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&
-		    TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&
+		if (TLVP_PRES_LEN(new_attr, NM_ATT_TSC, 1) &&
 		    *TLVP_VAL(new_attr, NM_ATT_TSC) != (bts->bsic & 7)) {
 			LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",
 				*TLVP_VAL(new_attr, NM_ATT_TSC), bts->bsic & 7);
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 776a50c4..e1264afd 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1718,8 +1718,7 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
 		/* our L1 only supports one global TSC for all channels
 		 * one one TRX, so we need to make sure not to activate
 		 * channels with a different TSC!! */
-		if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&
-		    TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&
+		if (TLVP_PRES_LEN(new_attr, NM_ATT_TSC, 1) &&
 		    *TLVP_VAL(new_attr, NM_ATT_TSC) != (bts->bsic & 7)) {
 			LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",
 				*TLVP_VAL(new_attr, NM_ATT_TSC), bts->bsic & 7);
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index f9ba5fa0..336ffaba 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -343,7 +343,7 @@ static uint8_t trx_set_bts(struct gsm_bts *bts, struct tlv_parsed *new_attr)
 	uint8_t bsic = bts->bsic;
 	struct gsm_bts_role_bts *btsb = bts_role_bts(bts);
 
-	if (TLVP_PRESENT(new_attr, NM_ATT_CONN_FAIL_CRIT)) {
+	if (TLVP_PRES_LEN(new_attr, NM_ATT_CONN_FAIL_CRIT, 1)) {
 		const uint8_t *val = TLVP_VAL(new_attr, NM_ATT_CONN_FAIL_CRIT);
 		btsb->radio_link_timeout = val[1];
 	}