From: Patrick McHardy Date: Mon, 12 Jan 2009 00:06:04 +0000 (+0000) Subject: netfilter 04/09: x_tables: fix match/target revision lookup X-Git-Tag: v3.12-rc1~16186^2~59 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=656caff20e12ba6e07b4bf342641df5ab33b4e49;p=kernel%2Fkernel-generic.git 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 Signed-off-by: David S. Miller --- 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; }