diff options
| author | Ying Xue <ying.xue@windriver.com> | 2014-12-02 08:00:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 02:39:56 +0100 |
| commit | 38622f41956f92a06f5b5e42e50746851110d970 (patch) | |
| tree | fda4efa237bd3481270aabae6a7bfee7bffdcf93 /net/tipc | |
| parent | tipc: make name table allocated dynamically (diff) | |
| download | linux-38622f41956f92a06f5b5e42e50746851110d970.tar.xz linux-38622f41956f92a06f5b5e42e50746851110d970.zip | |
tipc: ensure all name sequences are released when name table is stopped
As TIPC subscriber server is terminated before name table, no user
depends on subscription list of name sequence when name table is
stopped. Therefore, all name sequences stored in name table should
be released whatever their subscriptions lists are empty or not,
otherwise, memory leak might happen.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/name_table.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index df3da2924fc7..ba0ee3e8b623 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c @@ -964,10 +964,6 @@ static void tipc_purge_publications(struct name_seq *seq) struct sub_seq *sseq; struct name_info *info; - if (!seq->sseqs) { - nameseq_delete_empty(seq); - return; - } sseq = seq->sseqs; info = sseq->info; list_for_each_entry_safe(publ, safe, &info->zone_list, zone_list) { @@ -975,6 +971,9 @@ static void tipc_purge_publications(struct name_seq *seq) publ->ref, publ->key); kfree(publ); } + hlist_del_init(&seq->ns_list); + kfree(seq->sseqs); + kfree(seq); } void tipc_nametbl_stop(void) |