diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-14 16:13:16 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-14 16:13:16 +0800 |
| commit | 8e78fa7862b6adf5f668455dfb3ed09642ba8e6b (patch) | |
| tree | c884c6469dafeb693aafe0ddddf32812e0f5f067 /openbsc/src/gsm_04_11.c | |
| parent | 4cd515887452ce71f4f1150d5e5444bde0175451 (diff) | |
gsm_04_11: Attempt to fix some possible memory leaks in the SMS code
Sometimes we need to free the SMS, sometimes also the transaction.
Diffstat (limited to 'openbsc/src/gsm_04_11.c')
| -rw-r--r-- | openbsc/src/gsm_04_11.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/openbsc/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c index 5d9151642..c914d8218 100644 --- a/openbsc/src/gsm_04_11.c +++ b/openbsc/src/gsm_04_11.c @@ -546,8 +546,10 @@ static int gsm340_rx_tpdu(struct gsm_subscriber_connection *conn, struct msgb *m gsms->data_coding_scheme = *smsp++; sms_alphabet = gsm338_get_sms_alphabet(gsms->data_coding_scheme); - if (sms_alphabet == 0xffffffff) + if (sms_alphabet == 0xffffffff) { + sms_free(gsms); return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; + } switch (sms_vpf) { case GSM340_TP_VPF_RELATIVE: @@ -1029,6 +1031,7 @@ int gsm411_send_sms_lchan(struct gsm_subscriber_connection *conn, struct gsm_sms transaction_id = trans_assign_trans_id(conn->subscr, GSM48_PDISC_SMS, 0); if (transaction_id == -1) { LOGP(DSMS, LOGL_ERROR, "No available transaction ids\n"); + sms_free(sms); return -EBUSY; } @@ -1039,6 +1042,7 @@ int gsm411_send_sms_lchan(struct gsm_subscriber_connection *conn, struct gsm_sms transaction_id, new_callref++); if (!trans) { LOGP(DSMS, LOGL_ERROR, "No memory for trans\n"); + sms_free(sms); /* FIXME: send some error message */ return -ENOMEM; } @@ -1072,6 +1076,8 @@ int gsm411_send_sms_lchan(struct gsm_subscriber_connection *conn, struct gsm_sms /* generate the 03.40 TPDU */ rc = gsm340_gen_tpdu(msg, sms); if (rc < 0) { + trans_free(trans); + sms_free(sms); msgb_free(msg); return rc; } |