Skip to contentSkip to conversation

Patch "netfilter: nf_log: wait for rcu grace after logger unregistration" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (3)
Networking Stable branch netfilter
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

netfilter: nf_log: wait for rcu grace after logger unregistration

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
netfilter-nf_log-wait-for-rcu-grace-after-logger-unregistration.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ad5001cc7cdf9aaee5eb213fdee657e4a3c94776 Mon Sep 17 00:00:00 2001

From: Pablo Neira Ayuso <[email protected]>
Date: Thu, 17 Sep 2015 13:37:00 +0200
Subject: netfilter: nf_log: wait for rcu grace after logger unregistration

From: Pablo Neira Ayuso <[email protected]>

commit ad5001cc7cdf9aaee5eb213fdee657e4a3c94776 upstream.

The nf_log_unregister() function needs to call synchronize_rcu() to make sure that the objects are not dereferenced anymore on module removal.

Fixes 5962815a6a56 ("netfilter: nf_log: use an array of loggers instead of list")
Signed-off-by Pablo Neira Ayuso <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 net/netfilter/nf_log.c |    1 +
 1 file changed, 1 insertion(+)
net/netfilter/nf_log.c +1 -0
@@ -113,6 +113,7 @@ void nf_log_unregister(struct nf_logger
 	for (i = 0; i < NFPROTO_NUMPROTO; i++)
 		RCU_INIT_POINTER(loggers[i][logger->type], NULL);
 	mutex_unlock(&nf_log_mutex);
+	synchronize_rcu();
 }
 EXPORT_SYMBOL(nf_log_unregister);

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/netfilter-nft_compat-skip-family-comparison-in-case-of-nfproto_unspec.patch queue-4.2/netfilter-conntrack-use-nf_ct_tmpl_free-in-ct-synproxy-error-paths.patch queue-4.2/netfilter-nf_log-wait-for-rcu-grace-after-logger-unregistration.patch queue-4.2/netfilter-bridge-fix-ipv6-packets-not-being-bridged-with-config_ipv6-n.patch queue-4.2/netfilter-nfnetlink-work-around-wrong-endianess-in-res_id-field.patch queue-4.2/netfilter-ipset-fixing-unnamed-union-init.patch queue-4.2/netfilter-nf_log-don-t-zap-all-loggers-on-unregister.patch queue-4.2/netfilter-nf_tables-use-32-bit-addressing-register-from-nft_type_to_reg.patch