netfilter: nf_log: wait for rcu grace after logger unregistration
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 17 Sep 2015 11:37:00 +0000 (13:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Oct 2015 21:43:18 +0000 (14:43 -0700)
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>
net/netfilter/nf_log.c

index 675d12c..3fa4f47 100644 (file)
@@ -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);