aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-10-04 22:24:12 +0200
committerPatrick McHardy <kaber@trash.net>2010-10-04 22:24:12 +0200
commitf68c53015c5b9aa98ffd87a34009f89bdbbd7160 (patch)
tree93c420dc5f5643125d1bad05398faceeade47416 /net
parente55df53dd62c73185af46fb6ffa7074b05ceefc4 (diff)
downloadmrst-s0i3-test-f68c53015c5b9aa98ffd87a34009f89bdbbd7160.tar.gz
mrst-s0i3-test-f68c53015c5b9aa98ffd87a34009f89bdbbd7160.tar.xz
mrst-s0i3-test-f68c53015c5b9aa98ffd87a34009f89bdbbd7160.zip
netfilter: unregister nf hooks, matches and targets in the reverse order
Since we register nf hooks, matches and targets in order, we'd better unregister them in the reverse order. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/core.c6
-rw-r--r--net/netfilter/x_tables.c12
2 files changed, 6 insertions, 12 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 78b505d33bf..8f014f22d13 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -105,10 +105,8 @@ EXPORT_SYMBOL(nf_register_hooks);
void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n)
{
- unsigned int i;
-
- for (i = 0; i < n; i++)
- nf_unregister_hook(&reg[i]);
+ while (n-- > 0)
+ nf_unregister_hook(&reg[n]);
}
EXPORT_SYMBOL(nf_unregister_hooks);
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index e34622fa000..80463507420 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -116,10 +116,8 @@ EXPORT_SYMBOL(xt_register_targets);
void
xt_unregister_targets(struct xt_target *target, unsigned int n)
{
- unsigned int i;
-
- for (i = 0; i < n; i++)
- xt_unregister_target(&target[i]);
+ while (n-- > 0)
+ xt_unregister_target(&target[n]);
}
EXPORT_SYMBOL(xt_unregister_targets);
@@ -174,10 +172,8 @@ EXPORT_SYMBOL(xt_register_matches);
void
xt_unregister_matches(struct xt_match *match, unsigned int n)
{
- unsigned int i;
-
- for (i = 0; i < n; i++)
- xt_unregister_match(&match[i]);
+ while (n-- > 0)
+ xt_unregister_match(&match[n]);
}
EXPORT_SYMBOL(xt_unregister_matches);