commit 3326ba7d4c046ed4dcd4946cb354e18a99e139dc
author Alexander Couzens <lynxis@fe80.eu> Wed Dec 09 22:02:55 2020 +0100
committer Alexander Couzens <lynxis@fe80.eu> Tue Dec 15 11:57:16 2020 +0100
tree f77f29fb029f76881a38fd4ac38c28b58f9e9add
parent b6b2f14197ff9bf7850501e055e6ed79e6f722b7

sgsn: check for NULL of gprs_subscr_get_or_create()

gprs_subscr_get_or_create() can return NULL if no memory can
be allocated. Detected by the compiler on Ubuntu s390x.

Signed-off-by: Steve Langasek <steve.langasek@ubuntu.com>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082

src/sgsn/gprs_subscriber.c

diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c
index c23b332..943fbc3 100644
--- a/src/sgsn/gprs_subscriber.c
+++ b/src/sgsn/gprs_subscriber.c
@@ -870,6 +870,8 @@
 
 	if (!subscr) {
 		subscr = gprs_subscr_get_or_create(mmctx->imsi);
+		if (!subscr)
+			return NULL;
 		subscr->flags |= GPRS_SUBSCRIBER_FIRST_CONTACT;
 		subscr->flags &= ~GPRS_SUBSCRIBER_ENABLE_PURGE;
 	}
@@ -893,6 +895,8 @@
 	LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber data update\n");
 
 	subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);
+	if (!subscr)
+		return -ENOMEM;
 
 	subscr->flags |= GPRS_SUBSCRIBER_UPDATE_LOCATION_PENDING;
 
@@ -918,6 +922,8 @@
 	LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber authentication info\n");
 
 	subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);
+	if (!subscr)
+		return -ENOMEM;
 
 	subscr->flags |= GPRS_SUBSCRIBER_UPDATE_AUTH_INFO_PENDING;
 

src/sgsn/sgsn_vty.c

diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index 33a652c..fee328e 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -1020,6 +1020,10 @@
 	}
 
 	subscr = gprs_subscr_get_or_create(imsi);
+	if (!subscr) {
+		vty_out(vty, "Can not create subscriber. Out of memory.%s", imsi);
+		return CMD_WARNING;
+	}
 	subscr->keep_in_ram = 1;
 	gprs_subscr_put(subscr);