April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: abis_nm: always check return value of tlv_parse()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27865 ) Change subject: abis_nm: always check return value of tlv_parse() ...................................................................... abis_nm: always check return value of tlv_parse() Change-Id: Iecba34a96f71922ddd25028e7d3404f89b1106de --- M src/osmo-bsc/abis_nm.c 1 file changed, 41 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/27865/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 1c21bc2..f7882ac 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -256,8 +256,12 @@ new_state = *nm_state; + if (abis_nm_tlv_parse(&tp, bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + DEBUGPFOH(DNM, foh, "STATE CHG: "); - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); if (TLVP_PRESENT(&tp, NM_ATT_OPER_STATE)) { new_state.operational = *TLVP_VAL(&tp, NM_ATT_OPER_STATE); DEBUGPC(DNM, "OP_STATE=%s ", @@ -375,8 +379,10 @@ sd = talloc_zero(tall_bsc_ctx, struct nm_fail_rep_signal_data); OSMO_ASSERT(sd); - if (abis_nm_tlv_parse(&sd->tp, bts, foh->data, oh->length-sizeof(*foh)) < 0) + if (abis_nm_tlv_parse(&sd->tp, bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); goto fail; + } if (TLVP_PRESENT(&sd->tp, NM_ATT_ADD_TEXT)) { const uint8_t *val = TLVP_VAL(&sd->tp, NM_ATT_ADD_TEXT); @@ -678,7 +684,11 @@ /* After parsing unreported attribute id list inside Response info, there's a list of reported attribute ids and their values, in a TLV list form. */ - abis_nm_tlv_parse(tp, bts, data, data_len); + if (abis_nm_tlv_parse(tp, bts, data, data_len) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + return parse_attr_resp_info_attr(bts, trx, foh, tp); } @@ -698,7 +708,10 @@ DEBUGPFOH(DNM, foh, "Get Attributes Response\n"); - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + if (abis_nm_tlv_parse(&tp, bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ if (bts->type != GSM_BTS_TYPE_NANOBTS) @@ -734,7 +747,11 @@ return ret; } - abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length-sizeof(*foh)); + if (abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + sw_config = TLVP_VAL(&tp, NM_ATT_SW_CONFIG); sw_config_len = TLVP_LEN(&tp, NM_ATT_SW_CONFIG); if (!TLVP_PRESENT(&tp, NM_ATT_SW_CONFIG)) { @@ -771,7 +788,11 @@ struct tlv_parsed tp; uint8_t adm_state; - abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length-sizeof(*foh)); + if (abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) return -EINVAL; @@ -790,8 +811,12 @@ struct e1inp_sign_link *sign_link = mb->dst; struct tlv_parsed tp; + if (abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + DEBUGPFOH(DNM, foh, "LMT Event "); - abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length-sizeof(*foh)); if (TLVP_PRESENT(&tp, NM_ATT_BS11_LMT_LOGON_SESSION) && TLVP_LEN(&tp, NM_ATT_BS11_LMT_LOGON_SESSION) >= 1) { uint8_t onoff = *TLVP_VAL(&tp, NM_ATT_BS11_LMT_LOGON_SESSION); @@ -943,9 +968,12 @@ struct nm_nack_signal_data nack_data; struct tlv_parsed tp; - LOGPFOH(DNM, LOGL_NOTICE, foh, "%s NACK ", abis_nm_nack_name(mt)); + if (abis_nm_tlv_parse(&tp, bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + LOGPFOH(DNM, LOGL_NOTICE, foh, "%s NACK ", abis_nm_nack_name(mt)); if (TLVP_PRESENT(&tp, NM_ATT_NACK_CAUSES)) LOGPC(DNM, LOGL_NOTICE, "CAUSE=%s\n", abis_nm_nack_cause_name(*TLVP_VAL(&tp, NM_ATT_NACK_CAUSES))); @@ -2838,7 +2866,10 @@ return -EINVAL; } - abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length-sizeof(*foh)); + if (abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } /* The message might be received over the main OML link, so we cannot * just use sign_link->trx. Resolve it by number from the FOM header. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iecba34a96f71922ddd25028e7d3404f89b1106de Gerrit-Change-Number: 27865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27860 ) Change subject: abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll() ...................................................................... abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll() Found with GCC's static analyzer (-fanalyzer). Change-Id: I620538388f6971418980b03a6a1b2384e7c87e15 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/27860/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 03e409d..5c8be50 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2520,6 +2520,8 @@ sapi = rllh->link_id & 0x7; msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx RLL: "); + if (OSMO_UNLIKELY(msg->lchan == NULL)) + return -1; switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I620538388f6971418980b03a6a1b2384e7c87e15 Gerrit-Change-Number: 27860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: gsm_data: use llist_for_each_entry() in gsm_bts_by_lac()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27861 ) Change subject: gsm_data: use llist_for_each_entry() in gsm_bts_by_lac() ...................................................................... gsm_data: use llist_for_each_entry() in gsm_bts_by_lac() Change-Id: I55c8067dc377aaccb63e8d5f8d2ca89cbb74b11a --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/61/27861/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 28b2a1d..b52b3ff 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -62,16 +62,13 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, struct gsm_bts *start_bts) { - int i; struct gsm_bts *bts; int skip = 0; if (start_bts) skip = 1; - for (i = 0; i < net->num_bts; i++) { - bts = gsm_bts_num(net, i); - + llist_for_each_entry(bts, &net->bts_list, list) { if (skip) { if (start_bts == bts) skip = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55c8067dc377aaccb63e8d5f8d2ca89cbb74b11a Gerrit-Change-Number: 27861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: utils/meas_db: fix -Wunused-variable warnings

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27862 ) Change subject: utils/meas_db: fix -Wunused-variable warnings ...................................................................... utils/meas_db: fix -Wunused-variable warnings When building with CFLAGS="-flto -Wall", I get the following: meas_db.c: In function ‘_insert_ud’: meas_db.c:62:23: warning: unused variable ‘rowid’ [-Wunused-variable] 62 | unsigned long rowid; meas_db.c: In function ‘meas_db_insert’: meas_db.c:89:13: warning: unused variable ‘rc’ [-Wunused-variable] 89 | int rc; meas_db.c: In function ‘check_create_tbl’: meas_db.c:260:16: warning: unused variable ‘rc’ [-Wunused-variable] 260 | int i, rc; Change-Id: Id12958f67a47b6b3ebece7252e4f7c0835d4bb96 --- M src/utils/meas_db.c 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/27862/1 diff --git a/src/utils/meas_db.c b/src/utils/meas_db.c index 4fc2916..bf3a093 100644 --- a/src/utils/meas_db.c +++ b/src/utils/meas_db.c @@ -59,8 +59,6 @@ static int _insert_ud(struct meas_db_state *st, unsigned long meas_id, int dtx, int uplink, const struct gsm_meas_rep_unidir *ud) { - unsigned long rowid; - SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 1, meas_id)); SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_ud, 2, rxlev2dbm(ud->full.rx_lev))); @@ -86,7 +84,6 @@ const char *scenario, const struct gsm_meas_rep *mr) { - int rc; sqlite3_int64 rowid, ul_rowid, dl_rowid; SCK_OK(st->db, sqlite3_bind_int(st->stmt_ins_mr, 1, timestamp)); @@ -257,7 +254,7 @@ static int check_create_tbl(struct meas_db_state *st) { - int i, rc; + int i; for (i = 0; i < ARRAY_SIZE(create_stmts); i++) { SCK_OK(st->db, sqlite3_exec(st->db, create_stmts[i], -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id12958f67a47b6b3ebece7252e4f7c0835d4bb96 Gerrit-Change-Number: 27862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: Simplify bts->paging initialization

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27858 ) Change subject: bts: Simplify bts->paging initialization ...................................................................... Patch Set 4: (1 comment) File src/utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-bsc/+/27858/comment/169f4265_acff214f PS4, Line 12: $(LIBOSMONETIF_CFLAGS) \ This looks like a separate change, or why are you adding these CFLAGS here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a Gerrit-Change-Number: 27858 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Apr 2022 11:54:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bsc_vty: Add missing header

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27859 ) Change subject: bsc_vty: Add missing header ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I83c6dc786ed07703da5eeb3c89df66cc6c4f2033 Gerrit-Change-Number: 27859 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Apr 2022 11:52:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: Simplify bts->paging initialization

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 to look at the new patch set (#4). Change subject: bts: Simplify bts->paging initialization ...................................................................... bts: Simplify bts->paging initialization Related: SYS#5922 Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/paging.h M src/ipaccess/Makefile.am M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c M src/utils/Makefile.am 8 files changed, 32 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/27858/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a Gerrit-Change-Number: 27858 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bsc_vty: Add missing header

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27859 ) Change subject: bsc_vty: Add missing header ...................................................................... bsc_vty: Add missing header Change-Id: I83c6dc786ed07703da5eeb3c89df66cc6c4f2033 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/27859/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 5976721..6fb78d8 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -64,6 +64,7 @@ #include <osmocom/bsc/bsc_subscr_conn_fsm.h> #include <osmocom/bsc/assignment_fsm.h> #include <osmocom/bsc/bssmap_reset.h> +#include <osmocom/bsc/bsc_msc_data.h> #include <inttypes.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I83c6dc786ed07703da5eeb3c89df66cc6c4f2033 Gerrit-Change-Number: 27859 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: Simplify bts->paging initialization

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 to look at the new patch set (#3). Change subject: bts: Simplify bts->paging initialization ...................................................................... bts: Simplify bts->paging initialization Related: SYS#5922 Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/paging.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c M src/utils/Makefile.am 7 files changed, 30 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/27858/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a Gerrit-Change-Number: 27858 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: Simplify bts->paging initialization

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 to look at the new patch set (#2). Change subject: bts: Simplify bts->paging initialization ...................................................................... bts: Simplify bts->paging initialization Related: SYS#5922 Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/paging.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 6 files changed, 28 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/27858/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a Gerrit-Change-Number: 27858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022