From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 17 Sep 2015 11:37:00 +0000 (+0200)
Subject: netfilter: nf_log: wait for rcu grace after logger unregistration
X-Git-Tag: v4.1.11~111
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cc2cc007bc8307f0f8f6e6686af2835d8fd0eecd;p=users%2Fjedix%2Flinux-maple.git

netfilter: nf_log: wait for rcu grace after logger unregistration

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 <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 675d12c69e325..3fa4f47c34c81 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -113,6 +113,7 @@ void nf_log_unregister(struct nf_logger *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);