diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-02-03 13:41:29 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-03 13:41:29 +0100 |
| commit | 794e68716bab578ae8f8912dc934496d7c7abc90 (patch) | |
| tree | 22cd94a58059a00711fad3570c92c820665a882b /include/net | |
| parent | netfilter: xt_hashlimit: fix race condition and simplify locking (diff) | |
| download | linux-794e68716bab578ae8f8912dc934496d7c7abc90.tar.xz linux-794e68716bab578ae8f8912dc934496d7c7abc90.zip | |
netfilter: ctnetlink: only assign helpers for matching protocols
Make sure not to assign a helper for a different network or transport
layer protocol to a connection.
Additionally change expectation deletion by helper to compare the name
directly - there might be multiple helper registrations using the same
name, currently one of them is chosen in an unpredictable manner and
only those expectations are removed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index d015de92e03f..86be7c4816d6 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -40,7 +40,7 @@ struct nf_conntrack_helper { }; extern struct nf_conntrack_helper * -__nf_conntrack_helper_find_byname(const char *name); +__nf_conntrack_helper_find(const char *name, u16 l3num, u8 protonum); extern int nf_conntrack_helper_register(struct nf_conntrack_helper *); extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *); |