pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31727 ) Change subject: rlcmac: Fix several ptr bugs looking up ul tbf upon rx PktUlAss ...................................................................... rlcmac: Fix several ptr bugs looking up ul tbf upon rx PktUlAss Related: Coverity CID#310957 Change-Id: I0b031761dbbc93c1c06ba94967e91180062613fd --- M src/rlcmac/rlcmac.c 1 file changed, 23 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index 82394e6..b090cee 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -366,13 +366,14 @@ const Packet_Uplink_Assignment_t *ulass = &dl_block->u.Packet_Uplink_Assignment; int rc; - /* Attempt to find relevant UL TBF in assignment state from ID (set "gre" ptr): */ + /* Attempt to find relevant MS owning UL TBF in assignment state from ID (set "gre" ptr): */ switch (ulass->ID.UnionType) { case 0: /* GLOBAL_TFI: */ switch (ulass->ID.u.Global_TFI.UnionType) { case 0: /* UL TFI */ ul_tbf = gprs_rlcmac_find_ul_tbf_by_tfi(ulass->ID.u.Global_TFI.u.UPLINK_TFI); - gre = ul_tbf->tbf.gre; + if (ul_tbf) + gre = ul_tbf->tbf.gre; break; case 1: /* DL TFI */ dl_tbf = gprs_rlcmac_find_dl_tbf_by_tfi(ulass->ID.u.Global_TFI.u.DOWNLINK_TFI); @@ -385,8 +386,6 @@ break; case 1: /* TLLI */ gre = gprs_rlcmac_find_entity_by_tlli(ulass->ID.u.TLLI); - if (gre) - ul_tbf = gre->ul_tbf; break; case 2: /* TQI */ case 3: /* Packet_Request_Reference */ @@ -397,11 +396,17 @@ break; } - if (!gre->ul_tbf) { - LOGRLCMAC(LOGL_INFO, "TS=%u FN=%u Rx Pkt UL ACK/NACK: UL_TBF TFI=%u not found\n", + if (!gre) { + LOGRLCMAC(LOGL_INFO, "TS=%u FN=%u Rx Pkt UL ASS: MS not found\n", rlcmac_prim->l1ctl.pdch_data_ind.ts_nr, - rlcmac_prim->l1ctl.pdch_data_ind.fn, - dl_block->TFI); + rlcmac_prim->l1ctl.pdch_data_ind.fn); + return -ENOENT; + } + + if (!gre->ul_tbf) { + LOGGRE(gre, LOGL_INFO, "TS=%u FN=%u Rx Pkt UL ASS: MS has no UL TBF\n", + rlcmac_prim->l1ctl.pdch_data_ind.ts_nr, + rlcmac_prim->l1ctl.pdch_data_ind.fn); return -ENOENT; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0b031761dbbc93c1c06ba94967e91180062613fd Gerrit-Change-Number: 31727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged