cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

mscpool: fix refcount leak for unusual case of no bts 

by reading the code, I notice that a refcount on the subscr would be leaked if
there were no bts. That is not realistically happening, but nevertheless rather
rejigger so that no leak is possible, ever.

Change-Id: I0b804b8136cd78a777ca02667f696cdefa90c4a9
This commit is contained in:
Neels Hofmeyr 2020-08-18 17:01:00 +02:00
parent 45062b42ce
commit 90717c03a2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osmo-bsc/gsm_08_08.c
View File

@ -198,6 +198,7 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
bool is_emerg = false;
int16_t nri_v = -1;
bool is_null_nri = false;
struct gsm_bts *bts;
if (msgb_l3len(msg) < sizeof(*gh)) {
LOGP(DRSL, LOGL_ERROR, "There is no GSM48 header here.\n");
@ -221,10 +222,10 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
}
/* Has the subscriber been paged from a connected MSC? */
if (pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP) {
bts = conn_get_bts(conn);
if (bts && pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP) {
subscr = bsc_subscr_find_by_mi(conn->network->bsc_subscribers, &mi);
struct gsm_bts *bts = conn_get_bts(conn);
if (bts && subscr) {
if (subscr) {
msc_target = paging_get_msc(bts, subscr);
bsc_subscr_put(subscr);
if (is_msc_usable(msc_target, is_emerg)) {