summaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-09-17 13:37:00 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-10-27 22:13:35 -0400
commit8dafc9930cc2d2cb895cbec6ab83d0bfeb46fac6 (patch)
treebd71f2bcc2274bc7b77a55eb66147afb3c3c5a06 /net/netfilter
parentba1fa01d6d2ed019df3d6fe7ac3585d1f8902cd9 (diff)
netfilter: nf_log: wait for rcu grace after logger unregistration
[ Upstream commit ad5001cc7cdf9aaee5eb213fdee657e4a3c94776 ] 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: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_log.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index d7197649dba6..b7d491ec5317 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -103,6 +103,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);