From ae645631b0cd3f170ecef650a363f05d60c5cc2e Mon Sep 17 00:00:00 2001 From: KOVACS Krisztian Date: Tue, 15 Nov 2005 16:47:34 -0800 Subject: [PATCH] --- yaml --- r: 14259 b: refs/heads/master c: 5a6f294e43e432bd207a702fea49ebb303ef9b23 h: refs/heads/master i: 14257: 9303cde2d97e053e637d82568c073108dadb73cf 14255: 9d077f1590e1d412cd210dc3574dfab02d63be4b v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d2c9135e74f1..e8c23e4b6bdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96479376c89e5be92c85bd350e3e2e8f0e7e3b52 +refs/heads/master: 5a6f294e43e432bd207a702fea49ebb303ef9b23 diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c index 9a67c796b385..ea094b231d62 100644 --- a/trunk/net/netfilter/nf_conntrack_core.c +++ b/trunk/net/netfilter/nf_conntrack_core.c @@ -1395,6 +1395,13 @@ void nf_conntrack_cleanup(void) kmem_cache_destroy(nf_conntrack_expect_cachep); free_conntrack_hash(nf_conntrack_hash, nf_conntrack_vmalloc, nf_conntrack_htable_size); + + /* free l3proto protocol tables */ + for (i = 0; i < PF_MAX; i++) + if (nf_ct_protos[i]) { + kfree(nf_ct_protos[i]); + nf_ct_protos[i] = NULL; + } } static struct list_head *alloc_hashtable(int size, int *vmalloced)