diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-01-12 00:06:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-12 21:18:34 -0800 |
| commit | 656caff20e12ba6e07b4bf342641df5ab33b4e49 (patch) | |
| tree | 67170a077bc0b4e5175afea32758ffd322df15f8 | |
| parent | 47e0e1ca13d64eeeb687995fbe4e239e743d7544 (diff) | |
| download | op-kernel-dev-656caff20e12ba6e07b4bf342641df5ab33b4e49.zip op-kernel-dev-656caff20e12ba6e07b4bf342641df5ab33b4e49.tar.gz | |
netfilter 04/09: x_tables: fix match/target revision lookup
Commit 55b69e91 (netfilter: implement NFPROTO_UNSPEC as a wildcard
for extensions) broke revision probing for matches and targets that
are registered with NFPROTO_UNSPEC.
Fix by continuing the search on the NFPROTO_UNSPEC list if nothing
is found on the af-specific lists.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/x_tables.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 89837a4..bfbf521 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -273,6 +273,10 @@ static int match_revfn(u8 af, const char *name, u8 revision, int *bestp) have_rev = 1; } } + + if (af != NFPROTO_UNSPEC && !have_rev) + return match_revfn(NFPROTO_UNSPEC, name, revision, bestp); + return have_rev; } @@ -289,6 +293,10 @@ static int target_revfn(u8 af, const char *name, u8 revision, int *bestp) have_rev = 1; } } + + if (af != NFPROTO_UNSPEC && !have_rev) + return target_revfn(NFPROTO_UNSPEC, name, revision, bestp); + return have_rev; } |
