diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-30 19:47:58 -0800 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-12-16 16:20:46 -0800 |
| commit | 6fe7624b306c7db201c07434ac511ab6fc7f0b2c (patch) | |
| tree | 5803c9811099433d0f0a875bd1c631a9628424f3 | |
| parent | 83b44db22cc477cb2f9f6e96d07812245cd060db (diff) | |
[PATCH] EBTABLES: Deal with the worst-case behaviour in loop checks.
No need to revisit a chain we'd already finished with during
the check for current hook. It's either instant loop (which
we'd just detected) or a duplicate work.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 0fb2852ac59c..361d20bc9e6c 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -739,7 +739,9 @@ static int check_chainloops(struct ebt_entries *chain, struct ebt_cl_stack *cl_s BUGPRINT("loop\n"); return -1; } - /* this can't be 0, so the above test is correct */ + if (cl_s[i].hookmask & (1 << hooknr)) + goto letscontinue; + /* this can't be 0, so the loop test is correct */ cl_s[i].cs.n = pos + 1; pos = 0; cl_s[i].cs.e = ((void *)e + e->next_offset); |