July 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33844 ) Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... nacc_fsm: fix uninitialized neigh_key variable in handle_retrans_pkt_cell_chg_notif, the variable neigh_key is used uninitialized at end of the function. This has been introduced with Change I96280f0ec5955ed3cb17641bf4118496c929bdac, where we modified fill_neigh_key_from_bts_pkt_cell_chg()_not so that it write directly at the ctx variable. This works in st_initial but not in handle_retrans_pkt_cell_chg_notif(), so let's have neigh_key and neigh_key_present as a parameter so that the caller can decide where the result is stored. Fixes: CID#322150 Related: OS#6100 Change-Id: I7e74beda03829d909b6542659316241c275a36b3 --- M src/nacc_fsm.c 1 file changed, 43 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 6ccfee9..24954a4 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -270,16 +270,20 @@ return 0; } -static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct nacc_fsm_ctx *ctx, +/* Generate neighbour key information from a given PacketCellCHangeNotification and a BTS object (lac and cid). The + * ctx variable is used for logging only. */ +static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct neigh_cache_entry_key *neigh_key, + bool *neigh_key_present, const struct gprs_rlcmac_bts *bts, - const Packet_Cell_Change_Notification_t *notif) + const Packet_Cell_Change_Notification_t *notif, + const struct nacc_fsm_ctx *ctx) { const Target_Cell_GSM_Notif_t *notif_gsm; const Target_Cell_3G_Notif_t *notif_3g; const Target_Cell_4G_Notif_t *notif_4g; - memset(&ctx->neigh_key, 0, sizeof(ctx->neigh_key)); - ctx->neigh_key_present = false; + memset(neigh_key, 0, sizeof(*neigh_key)); + *neigh_key_present = false; switch (notif->Target_Cell.UnionType) { case 0: /* GSM */ @@ -287,11 +291,11 @@ LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell: RAT=GSM, ARFCN=%u, BSIC=%u\n", notif_gsm->ARFCN, notif_gsm->BSIC); - ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; - ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; - ctx->neigh_key.tgt_arfcn = notif_gsm->ARFCN; - ctx->neigh_key.tgt_bsic = notif_gsm->BSIC; - ctx->neigh_key_present = true; + neigh_key->local_lac = bts->cgi_ps.rai.lac.lac; + neigh_key->local_ci = bts->cgi_ps.cell_identity; + neigh_key->tgt_arfcn = notif_gsm->ARFCN; + neigh_key->tgt_bsic = notif_gsm->BSIC; + *neigh_key_present = true; return 0; default: switch (notif->Target_Cell.u.Target_Other_RAT_Notif.UnionType) { @@ -316,11 +320,11 @@ if (notif_4g->Exist_Arfcn) { LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell: RAT=GSM, ARFCN=%u, BSIC=%u\n", notif_4g->Arfcn, notif_4g->bsic); - ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; - ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; - ctx->neigh_key.tgt_arfcn = notif_4g->Arfcn; - ctx->neigh_key.tgt_bsic = notif_4g->bsic; - ctx->neigh_key_present = true; + neigh_key->local_lac = bts->cgi_ps.rai.lac.lac; + neigh_key->local_ci = bts->cgi_ps.cell_identity; + neigh_key->tgt_arfcn = notif_4g->Arfcn; + neigh_key->tgt_bsic = notif_4g->bsic; + *neigh_key_present = true; return 0; } if (notif_4g->Exist_3G_Target_Cell) { @@ -387,15 +391,16 @@ { struct gprs_rlcmac_bts *bts = ctx->ms->bts; struct neigh_cache_entry_key neigh_key; + bool neigh_key_present; int rc; - rc = fill_neigh_key_from_bts_pkt_cell_chg_not(ctx, bts, notif); + rc = fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, &neigh_key_present, bts, notif, ctx); if (rc < 0) { /* (see comment below) */ if (ctx->fi->state != NACC_ST_TX_CELL_CHG_CONTINUE) nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; - } else if (!ctx->neigh_key_present) { + } else if (!neigh_key_present) { /* In case no neighbour key information is present, (This would be the case for UTRAN or EUTRAN cells) * then we will not provide any system information. Instead we will send the PacketCellChangeContinue * message immediately. This also applies in the case of re-transmissions. See also: 3GPP TS 48.018, @@ -407,6 +412,7 @@ /* If tgt cell changed, restart resolving it */ if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) { ctx->neigh_key = neigh_key; + ctx->neigh_key_present = neigh_key_present; nacc_fsm_state_chg(ctx->fi, NACC_ST_WAIT_RESOLVE_RAC_CI); } /* else: ignore it, it's a dup, carry on what we were doing */ @@ -426,7 +432,7 @@ switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: notif = (Packet_Cell_Change_Notification_t *)data; - rc = fill_neigh_key_from_bts_pkt_cell_chg_not(ctx, bts, notif); + rc = fill_neigh_key_from_bts_pkt_cell_chg_not(&ctx->neigh_key, &ctx->neigh_key_present, bts, notif, ctx); if (rc < 0) osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); else if (!ctx->neigh_key_present) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33844 ) Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 11:12:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33844 ) Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... Patch Set 4: (1 comment) File src/nacc_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/33844/comment/62039a0f_78841b88 PS2, Line 279: struct nacc_fsm_ctx *ctx) > this should be const, it's only used for logging. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 11:08:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 to look at the new patch set (#4). Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... nacc_fsm: fix uninitialized neigh_key variable in handle_retrans_pkt_cell_chg_notif, the variable neigh_key is used uninitialized at end of the function. This has been introduced with Change I96280f0ec5955ed3cb17641bf4118496c929bdac, where we modified fill_neigh_key_from_bts_pkt_cell_chg()_not so that it write directly at the ctx variable. This works in st_initial but not in handle_retrans_pkt_cell_chg_notif(), so let's have neigh_key and neigh_key_present as a parameter so that the caller can decide where the result is stored. Fixes: CID#322150 Related: OS#6100 Change-Id: I7e74beda03829d909b6542659316241c275a36b3 --- M src/nacc_fsm.c 1 file changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/44/33844/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33844 ) Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 11:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33844 ) Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... Patch Set 3: (1 comment) File src/nacc_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/33844/comment/1f41bc48_3946bc38 PS2, Line 285: memset(&ctx->neigh_key, 0, sizeof(ctx->neigh_key)); > this must be neigh_key not the ctx one. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 10:52:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: fix uninitialized neigh_key variable

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 to look at the new patch set (#3). Change subject: nacc_fsm: fix uninitialized neigh_key variable ...................................................................... nacc_fsm: fix uninitialized neigh_key variable in handle_retrans_pkt_cell_chg_notif, the variable neigh_key is used uninitialized at end of the function. This has been introduced with Change I96280f0ec5955ed3cb17641bf4118496c929bdac, where we modified fill_neigh_key_from_bts_pkt_cell_chg()_not so that it write directly at the ctx variable. This works in st_initial but not in handle_retrans_pkt_cell_chg_notif(), so let's have neigh_key and neigh_key_present as a parameter so that the caller can decide where the result is stored. Fixes: CID#322150 Related: OS#6100 Change-Id: I7e74beda03829d909b6542659316241c275a36b3 --- M src/nacc_fsm.c 1 file changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/44/33844/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e74beda03829d909b6542659316241c275a36b3 Gerrit-Change-Number: 33844 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[S] Change in libosmo-netif[master]: example: Remove calls to osmo_ipa_process_msg()

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33205 ) Change subject: example: Remove calls to osmo_ipa_process_msg() ...................................................................... Patch Set 12: (1 comment) Patchset: PS11: > This should be merged into the previous commit that changes the segmentation_cb() ACK this is missing apparently :) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 Gerrit-Change-Number: 33205 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 10:26:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by pespin

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add and use IPA send function ...................................................................... Patch Set 12: (3 comments) Patchset: PS12: Some of your own comments seem to not be addressed yet. File examples/ipa-stream-client.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/e5c8d326_1321339e PS11, Line 109: if (osmo_ipa_process_msg(msg) < 0) { > Remove this, it's now handled in the segmentation_cb what about this comment? File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/bbad6fe2_9d515c57 PS12, Line 57: #define IPAC_PROTO_UNSPECIFIED -1 it's a bit strange to declare this here while others are probably declared somewhere else? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 10:25:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 14: (1 comment) Patchset: PS14: my comments where not yet taken into account -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 14 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 10:21:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2023