Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 210a9ebe authored by Harald Welte's avatar Harald Welte Committed by David S. Miller
Browse files

[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: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f682faef

net/ipv4/netfilter/ip_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ init_or_cleanup(int init) 
	return status;



cleanup:

	nf_unregister_queue_handler(PF_INET);

	nf_unregister_queue_handlers(&ipq_enqueue_packet);

	synchronize_net();

	ipq_flush(NF_DROP);

net/ipv6/netfilter/ip6_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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);