diff options
author | Changli Gao <xiaosuo@gmail.com> | 2010-10-04 16:24:12 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-10-04 16:24:12 -0400 |
commit | f68c53015c5b9aa98ffd87a34009f89bdbbd7160 (patch) | |
tree | 93c420dc5f5643125d1bad05398faceeade47416 /net/netfilter | |
parent | e55df53dd62c73185af46fb6ffa7074b05ceefc4 (diff) |
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/netfilter')
-rw-r--r-- | net/netfilter/core.c | 6 | ||||
-rw-r--r-- | net/netfilter/x_tables.c | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 78b505d33bfb..8f014f22d132 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c | |||
@@ -105,10 +105,8 @@ EXPORT_SYMBOL(nf_register_hooks); | |||
105 | 105 | ||
106 | void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n) | 106 | void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n) |
107 | { | 107 | { |
108 | unsigned int i; | 108 | while (n-- > 0) |
109 | 109 | nf_unregister_hook(®[n]); | |
110 | for (i = 0; i < n; i++) | ||
111 | nf_unregister_hook(®[i]); | ||
112 | } | 110 | } |
113 | EXPORT_SYMBOL(nf_unregister_hooks); | 111 | EXPORT_SYMBOL(nf_unregister_hooks); |
114 | 112 | ||
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index e34622fa0003..80463507420e 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -116,10 +116,8 @@ EXPORT_SYMBOL(xt_register_targets); | |||
116 | void | 116 | void |
117 | xt_unregister_targets(struct xt_target *target, unsigned int n) | 117 | xt_unregister_targets(struct xt_target *target, unsigned int n) |
118 | { | 118 | { |
119 | unsigned int i; | 119 | while (n-- > 0) |
120 | 120 | xt_unregister_target(&target[n]); | |
121 | for (i = 0; i < n; i++) | ||
122 | xt_unregister_target(&target[i]); | ||
123 | } | 121 | } |
124 | EXPORT_SYMBOL(xt_unregister_targets); | 122 | EXPORT_SYMBOL(xt_unregister_targets); |
125 | 123 | ||
@@ -174,10 +172,8 @@ EXPORT_SYMBOL(xt_register_matches); | |||
174 | void | 172 | void |
175 | xt_unregister_matches(struct xt_match *match, unsigned int n) | 173 | xt_unregister_matches(struct xt_match *match, unsigned int n) |
176 | { | 174 | { |
177 | unsigned int i; | 175 | while (n-- > 0) |
178 | 176 | xt_unregister_match(&match[n]); | |
179 | for (i = 0; i < n; i++) | ||
180 | xt_unregister_match(&match[i]); | ||
181 | } | 177 | } |
182 | EXPORT_SYMBOL(xt_unregister_matches); | 178 | EXPORT_SYMBOL(xt_unregister_matches); |
183 | 179 | ||