mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
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>
This commit is contained in:
parent
47e0e1ca13
commit
656caff20e
1 changed files with 8 additions and 0 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue