Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[mirror_ubuntu-bionic-kernel.git] / net / netfilter / nf_nat_core.c

diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index af8345fc4fbde30adad608b61a4fd293b4554584..6c38421e31f9cd46f234f8bb778b7f4e9a21ffd7 100644 (file)
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -542,17 +542,14 @@ static int nf_nat_proto_clean(struct nf_conn *ct, void *data)
        if (nf_nat_proto_remove(ct, data))
                return 1;
 
-       if ((ct->status & IPS_SRC_NAT_DONE) == 0)
-               return 0;
-
-       /* This netns is being destroyed, and conntrack has nat null binding.
+       /* This module is being removed and conntrack has nat null binding.
         * Remove it from bysource hash, as the table will be freed soon.
         *
         * Else, when the conntrack is destoyed, nf_nat_cleanup_conntrack()
         * will delete entry from already-freed table.
         */
-       clear_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);
-       __nf_nat_cleanup_conntrack(ct);
+       if (test_and_clear_bit(IPS_SRC_NAT_DONE_BIT, &ct->status))
+               __nf_nat_cleanup_conntrack(ct);
 
        /* don't delete conntrack.  Although that would make things a lot
         * simpler, we'd end up flushing all conntracks on nat rmmod.