diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-08-29 09:56:58 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-08-29 11:42:34 +0200 |
| commit | 73ec6980d5207e5eec46659b61a3f9fe07c88162 (patch) | |
| tree | 33d44ebb6bf2dbd4d316bca464ccb9769a938dcf /openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | |
| parent | dc16bdd3695fb62362106e8f15c65971cd794f4a (diff) | |
nat: Introduce a config free for the test and fix valgrind issues
The talloc_free on the nat lead to the freeing of the bsc_config
which lead to freeing of the rate_ctr_group. The rate_ctr_group
remained in a global list and the next creation of a bsc_config
would access dead memory. Fix it.
The free routine is only meant to be used by the test, for the
real nat we would need to make sure that all connections and
other state that refers to the cfg is removed/closed first.
Fix various memleaks in the test while we are at it. There are
still some to fix.
==7195== Invalid write of size 4
==7195== at 0x4043171: rate_ctr_group_alloc (linuxlist.h:65)
==7195== by 0x804D893: bsc_config_alloc (bsc_nat_utils.c:174)
==7195== by 0x804B5D2: main (bsc_nat_test.c:954)
==7195== Address 0x4311cbc is 52 bytes inside a block of size 208 free'd
==7195== at 0x4029D28: free (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so)
==7195== by 0x4048D98: _talloc_free (talloc.c:609)
==7195== by 0x4052806: talloc_free (talloc.c:578)
==7195== by 0x804B58A: main (bsc_nat_test.c:940)
Diffstat (limited to 'openbsc/src/osmo-bsc_nat/bsc_nat_utils.c')
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index 93831c417..70ad577b9 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -120,6 +120,32 @@ struct bsc_nat *bsc_nat_alloc(void) return nat; } +void bsc_nat_free(struct bsc_nat *nat) +{ + struct bsc_config *cfg, *tmp; + struct bsc_nat_acc_lst *lst, *tmp_lst; + + llist_for_each_entry_safe(cfg, tmp, &nat->bsc_configs, entry) + bsc_config_free(cfg); + llist_for_each_entry_safe(lst, tmp_lst, &nat->access_lists, list) + bsc_nat_acc_lst_delete(lst); + + bsc_nat_num_rewr_entry_adapt(nat, &nat->num_rewr, NULL); + bsc_nat_num_rewr_entry_adapt(nat, &nat->num_rewr_post, NULL); + bsc_nat_num_rewr_entry_adapt(nat, &nat->sms_clear_tp_srr, NULL); + bsc_nat_num_rewr_entry_adapt(nat, &nat->sms_num_rewr, NULL); + bsc_nat_num_rewr_entry_adapt(nat, &nat->tpdest_match, NULL); + + osmo_counter_free(nat->stats.sccp.conn); + osmo_counter_free(nat->stats.sccp.calls); + osmo_counter_free(nat->stats.bsc.reconn); + osmo_counter_free(nat->stats.bsc.auth_fail); + osmo_counter_free(nat->stats.msc.reconn); + osmo_counter_free(nat->stats.ussd.reconn); + talloc_free(nat->mgcp_cfg); + talloc_free(nat); +} + void bsc_nat_set_msc_ip(struct bsc_nat *nat, const char *ip) { bsc_replace_string(nat, &nat->main_dest->ip, ip); @@ -167,7 +193,9 @@ struct bsc_config *bsc_config_alloc(struct bsc_nat *nat, const char *token) void bsc_config_free(struct bsc_config *cfg) { + llist_del(&cfg->entry); rate_ctr_group_free(cfg->stats.ctrg); + talloc_free(cfg); } static void _add_lac(void *ctx, struct llist_head *list, int _lac) |