pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 )

Change subject: gprs_gmm: Introduce assert to guard against unexpected condition
......................................................................

gprs_gmm: Introduce assert to guard against unexpected condition

This may well be the culprit of OS#3957, were already freed llme is accessed 
from
mmctx context later on, upon some timer is triggered in mmctx.

Related: OS#3957

Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4
---
M src/gprs/gprs_gmm.c
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index 0fcf1bb..718fc97 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -1741,6 +1741,11 @@
                        "The MM context cannot be used, RA: %03d-%0*d-%d-%d\n",
                        mmctx->ra.mcc, mmctx->ra.mnc_3_digits, mmctx->ra.mnc,
                        mmctx->ra.lac, mmctx->ra.rac);
+               /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be
+                  called below, let's make sure we don't keep dangling llme
+                  pointers in mmctx (OS#3957). */
+               if (mmctx->ran_type == MM_CTX_T_GERAN_Gb)
+                       OSMO_ASSERT(mmctx->gb.llme == NULL);
                mmctx = NULL;
        }


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4
Gerrit-Change-Number: 15167
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@gnumonks.org>
Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged

Reply via email to