Change in libosmocore[master]: cbsp: Return error if decoding any of the cell id lists fail - gerrit-log

4 Aug 2022

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28935 )
Change subject: cbsp: Return error if decoding any of the cell id lists fail
......................................................................
cbsp: Return error if decoding any of the cell id lists fail
Change-Id: I5934167f927df0547cb57687e2717489fd1f3719
---
M src/gsm/cbsp.c
1 file changed, 107 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/28935/1

diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c
index a31517b..db07a08 100644
--- a/src/gsm/cbsp.c
+++ b/src/gsm/cbsp.c
@@ -639,6 +639,7 @@
    			struct msgb *in, void *ctx)
 {
    unsigned int i;
+	int rc;
/* check for mandatory IEs */
    if (!TLVP_PRESENT(tp, CBSP_IEI_MSG_ID) ||
@@ -656,8 +657,10 @@
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
if (TLVP_PRESENT(tp, CBSP_IEI_CHANNEL_IND)) {
    	uint8_t num_of_pages;
@@ -718,6 +721,8 @@
 static int cbsp_dec_write_repl_compl(struct osmo_cbsp_write_replace_complete *out,
    			     const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_NEW_SERIAL_NR, 2)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
@@ -733,14 +738,18 @@
INIT_LLIST_HEAD(&out->num_compl_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7)) {
-		cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+		rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    				   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    				   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+		if (rc < 0)
+			return rc;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
if (TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
    	out->channel_ind = talloc(ctx, enum cbsp_channel_ind);
@@ -753,6 +762,8 @@
 static int cbsp_dec_write_repl_fail(struct osmo_cbsp_write_replace_failure *out,
    			    const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_NEW_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5)) {
@@ -768,21 +779,27 @@
    }
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
-			      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
-			      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
+				   TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
+				   TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
INIT_LLIST_HEAD(&out->num_compl_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7)) {
-		cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+		rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    				   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    				   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+		if (rc < 0)
+			return rc;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
-		cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+		rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    			      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+		if (rc < 0)
+			return rc;
    }
if (TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
@@ -796,6 +813,8 @@
 static int cbsp_dec_kill(struct osmo_cbsp_kill *out, const struct tlv_parsed *tp,
    		 struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
@@ -807,8 +826,10 @@
    out->old_serial_nr = tlvp_val16be(tp, CBSP_IEI_OLD_SERIAL_NR);
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
if (TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
    	out->channel_ind = talloc(ctx, enum cbsp_channel_ind);
@@ -821,6 +842,8 @@
 static int cbsp_dec_kill_compl(struct osmo_cbsp_kill_complete *out, const struct tlv_parsed *tp,
    			struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
@@ -833,14 +856,18 @@
INIT_LLIST_HEAD(&out->num_compl_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7)) {
-		cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+		rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    				   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    				   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+		if (rc < 0)
+			return rc;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
if (TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
    	out->channel_ind = talloc(ctx, enum cbsp_channel_ind);
@@ -853,6 +880,8 @@
 static int cbsp_dec_kill_fail(struct osmo_cbsp_kill_failure *out, const struct tlv_parsed *tp,
    		      struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5)) {
@@ -864,21 +893,27 @@
    out->old_serial_nr = tlvp_val16be(tp, CBSP_IEI_OLD_SERIAL_NR);
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
    		      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
INIT_LLIST_HEAD(&out->num_compl_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7)) {
-		cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+		rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    				   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    				   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+		if (rc < 0)
+			return rc;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
-		cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+		rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    			      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+		if (rc < 0)
+			return rc;
    }
if (TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
@@ -892,6 +927,8 @@
 static int cbsp_dec_load_query(struct osmo_cbsp_load_query *out, const struct tlv_parsed *tp,
    			struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
@@ -899,8 +936,10 @@
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
out->channel_ind = *TLVP_VAL(tp, CBSP_IEI_CHANNEL_IND);
    return 0;
@@ -929,6 +968,8 @@
 static int cbsp_dec_load_query_fail(struct osmo_cbsp_load_query_failure *out,
    			    const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_CHANNEL_IND, 1)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
@@ -936,9 +977,11 @@
    }
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
    		      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
out->channel_ind = *TLVP_VAL(tp, CBSP_IEI_CHANNEL_IND);
@@ -955,6 +998,8 @@
 static int cbsp_dec_msg_status_query(struct osmo_cbsp_msg_status_query *out,
    			     const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1) ||
@@ -967,8 +1012,10 @@
    out->old_serial_nr = tlvp_val16be(tp, CBSP_IEI_OLD_SERIAL_NR);
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
out->channel_ind = *TLVP_VAL(tp, CBSP_IEI_CHANNEL_IND);
    return 0;
@@ -978,6 +1025,8 @@
 static int cbsp_dec_msg_status_query_compl(struct osmo_cbsp_msg_status_query_complete *out,
    				   const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7) ||
@@ -990,9 +1039,11 @@
    out->old_serial_nr = tlvp_val16be(tp, CBSP_IEI_OLD_SERIAL_NR);
INIT_LLIST_HEAD(&out->num_compl_list.list);
-	cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+	rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    			   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    			   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+	if (rc < 0)
+		return rc;
    out->channel_ind = *TLVP_VAL(tp, CBSP_IEI_CHANNEL_IND);
    return 0;
 }
@@ -1001,6 +1052,8 @@
 static int cbsp_dec_msg_status_query_fail(struct osmo_cbsp_msg_status_query_failure *out,
    				  const struct tlv_parsed *tp, struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_MSG_ID, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_OLD_SERIAL_NR, 2) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5) ||
@@ -1013,17 +1066,21 @@
    out->old_serial_nr = tlvp_val16be(tp, CBSP_IEI_OLD_SERIAL_NR);
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
    		      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
out->channel_ind = *TLVP_VAL(tp, CBSP_IEI_CHANNEL_IND);
INIT_LLIST_HEAD(&out->num_compl_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST, 7)) {
-		cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
+		rc = cbsp_decode_num_compl_list(&out->num_compl_list, ctx,
    				   TLVP_VAL(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST),
    				   TLVP_LEN(tp, CBSP_IEI_NUM_BCAST_COMPL_LIST));
+		if (rc < 0)
+			return rc;
    }
    return 0;
 }
@@ -1032,14 +1089,19 @@
 static int cbsp_dec_reset(struct osmo_cbsp_reset *out, const struct tlv_parsed *tp,
    		  struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
    	return -EINVAL;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
+
    return 0;
 }
@@ -1047,14 +1109,19 @@
 static int cbsp_dec_reset_compl(struct osmo_cbsp_reset_complete *out, const struct tlv_parsed *tp,
    			struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
    	return -EINVAL;
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
+
    return 0;
 }
@@ -1062,20 +1129,26 @@
 static int cbsp_dec_reset_fail(struct osmo_cbsp_reset_failure *out, const struct tlv_parsed *tp,
    			struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
    	return -EINVAL;
    }
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
    		      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
INIT_LLIST_HEAD(&out->cell_list.list);
    if (TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1)) {
-		cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+		rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    			      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+		if (rc < 0)
+			return rc;
    }
    return 0;
 }
@@ -1106,6 +1179,8 @@
 static int cbsp_dec_restart(struct osmo_cbsp_restart *out, const struct tlv_parsed *tp,
    		    struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_CELL_LIST, 1) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_BCAST_MSG_TYPE, 1) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_RECOVERY_IND, 1)) {
@@ -1114,8 +1189,10 @@
    }
INIT_LLIST_HEAD(&out->cell_list.list);
-	cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
+	rc = cbsp_decode_cell_list(&out->cell_list, ctx, TLVP_VAL(tp, CBSP_IEI_CELL_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_CELL_LIST));
+	if (rc < 0)
+		return rc;
out->bcast_msg_type = *TLVP_VAL(tp, CBSP_IEI_BCAST_MSG_TYPE);
    out->recovery_ind = *TLVP_VAL(tp, CBSP_IEI_RECOVERY_IND);
@@ -1126,6 +1203,8 @@
 static int cbsp_dec_failure(struct osmo_cbsp_failure *out, const struct tlv_parsed *tp,
    		    struct msgb *in, void *ctx)
 {
+	int rc;
+
    if (!TLVP_PRES_LEN(tp, CBSP_IEI_FAILURE_LIST, 5) ||
        !TLVP_PRES_LEN(tp, CBSP_IEI_BCAST_MSG_TYPE, 1)) {
    	osmo_cbsp_errstr = "missing/short mandatory IE";
@@ -1133,9 +1212,11 @@
    }
INIT_LLIST_HEAD(&out->fail_list);
-	cbsp_decode_fail_list(&out->fail_list, ctx,
+	rc = cbsp_decode_fail_list(&out->fail_list, ctx,
    		      TLVP_VAL(tp, CBSP_IEI_FAILURE_LIST),
    		      TLVP_LEN(tp, CBSP_IEI_FAILURE_LIST));
+	if (rc < 0)
+		return rc;
out->bcast_msg_type = *TLVP_VAL(tp, CBSP_IEI_BCAST_MSG_TYPE);
    return 0;
-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28935
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5934167f927df0547cb57687e2717489fd1f3719
Gerrit-Change-Number: 28935
Gerrit-PatchSet: 1
Gerrit-Owner: pespin pespin@sysmocom.de
Gerrit-MessageType: newchange



    