diff options
| author | Harald Welte | 2005-08-10 05:20:54 +0200 |
|---|---|---|
| committer | David S. Miller | 2005-08-30 00:51:08 +0200 |
| commit | 210a9ebef2d1bd32d9e9d81c84d538e237769cdb (patch) | |
| tree | b4ad1d992f137020333090c0fae6c898ee77fe5b /net/ipv6 | |
| parent | [NETFILTER]: fix autoloading of nfnetlink_log (diff) | |
| download | kernel-qcow2-linux-210a9ebef2d1bd32d9e9d81c84d538e237769cdb.tar.gz kernel-qcow2-linux-210a9ebef2d1bd32d9e9d81c84d538e237769cdb.tar.xz kernel-qcow2-linux-210a9ebef2d1bd32d9e9d81c84d538e237769cdb.zip | |
[NETFILTER]: ip{6}_queue: prevent unregistration race with nfnetlink_queue
Since nfnetlink_queue can override ip{6}_queue as queue handlers, we
can no longer blindly unregister whoever is registered for PF_INET[6],
but only unregister ourselves.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 5af4cee93d9b..56ffec3568fa 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -687,7 +687,7 @@ init_or_cleanup(int init) return status; cleanup: - nf_unregister_queue_handler(PF_INET6); + nf_unregister_queue_handlers(&ipq_enqueue_packet); synchronize_net(); ipq_flush(NF_DROP); |