lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: netns: put table module on netns stop

Browse Source 
When number of entries exceeds number of initial entries, foo-tables code
will pin table module. But during table unregister on netns stop,
that additional pin was forgotten.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan
2008-01-31 04:05:34 -08:00
committed by David S. Miller
parent 9ea0cb2601
commit df200969b1
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/netfilter/arp_tables.c
View File

@@ -1773,6 +1773,7 @@ void arpt_unregister_table(struct arpt_table *table)
{ {
struct xt_table_info *private; struct xt_table_info *private;
void *loc_cpu_entry; void *loc_cpu_entry;
struct module *table_owner = table->me;
private = xt_unregister_table(table); private = xt_unregister_table(table);
@@ -1780,6 +1781,8 @@ void arpt_unregister_table(struct arpt_table *table)
loc_cpu_entry = private->entries[raw_smp_processor_id()]; loc_cpu_entry = private->entries[raw_smp_processor_id()];
ARPT_ENTRY_ITERATE(loc_cpu_entry, private->size, ARPT_ENTRY_ITERATE(loc_cpu_entry, private->size,
cleanup_entry, NULL); cleanup_entry, NULL);
if (private->number > private->initial_entries)
module_put(table_owner);
xt_free_table_info(private); xt_free_table_info(private);
} }

3
net/ipv4/netfilter/ip_tables.c
View File

@@ -2095,12 +2095,15 @@ void ipt_unregister_table(struct xt_table *table)
{ {
struct xt_table_info *private; struct xt_table_info *private;
void *loc_cpu_entry; void *loc_cpu_entry;
struct module *table_owner = table->me;
private = xt_unregister_table(table); private = xt_unregister_table(table);
/* Decrease module usage counts and free resources */ /* Decrease module usage counts and free resources */
loc_cpu_entry = private->entries[raw_smp_processor_id()]; loc_cpu_entry = private->entries[raw_smp_processor_id()];
IPT_ENTRY_ITERATE(loc_cpu_entry, private->size, cleanup_entry, NULL); IPT_ENTRY_ITERATE(loc_cpu_entry, private->size, cleanup_entry, NULL);
if (private->number > private->initial_entries)
module_put(table_owner);
xt_free_table_info(private); xt_free_table_info(private);
} }

3
net/ipv6/netfilter/ip6_tables.c
View File

@@ -2121,12 +2121,15 @@ void ip6t_unregister_table(struct xt_table *table)
{ {
struct xt_table_info *private; struct xt_table_info *private;
void *loc_cpu_entry; void *loc_cpu_entry;
struct module *table_owner = table->me;
private = xt_unregister_table(table); private = xt_unregister_table(table);
/* Decrease module usage counts and free resources */ /* Decrease module usage counts and free resources */
loc_cpu_entry = private->entries[raw_smp_processor_id()]; loc_cpu_entry = private->entries[raw_smp_processor_id()];
IP6T_ENTRY_ITERATE(loc_cpu_entry, private->size, cleanup_entry, NULL); IP6T_ENTRY_ITERATE(loc_cpu_entry, private->size, cleanup_entry, NULL);
if (private->number > private->initial_entries)
module_put(table_owner);
xt_free_table_info(private); xt_free_table_info(private);
} }