Commit 205ee117 authored Sep 09, 2015 by Florian Westphal Committed by Pablo Neira Ayuso Sep 14, 2015

netfilter: nf_log: don't zap all loggers on unregister



like nf_log_unset, nf_log_unregister must not reset the list of loggers.
Otherwise, a call to nf_log_unregister() will render loggers of other nf
protocols unusable:

iptables -A INPUT -j LOG
modprobe nf_log_arp ; rmmod nf_log_arp
iptables -A INPUT -j LOG
iptables: No chain/target/match by that name

Fixes: 30e0c6a6 ("netfilter: nf_log: prepare net namespace support for loggers")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent e8684c88

net/netfilter/nf_log.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -107,11 +107,15 @@ EXPORT_SYMBOL(nf_log_register);

		void nf_log_unregister(struct nf_logger *logger)
		{
		const struct nf_logger *log;
		int i;

		mutex_lock(&nf_log_mutex);
		for (i = 0; i < NFPROTO_NUMPROTO; i++)
		for (i = 0; i < NFPROTO_NUMPROTO; i++) {
		log = nft_log_dereference(loggers[i][logger->type]);
		if (log == logger)
		RCU_INIT_POINTER(loggers[i][logger->type], NULL);
		}
		mutex_unlock(&nf_log_mutex);
		}
		EXPORT_SYMBOL(nf_log_unregister);

Admin message