From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:57534 "EHLO
        Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1752835AbdKOLa7 (ORCPT
        <rfc822;stable@vger.kernel.org>); Wed, 15 Nov 2017 06:30:59 -0500
Date: Wed, 15 Nov 2017 12:30:11 +0100
From: Florian Westphal <fw@strlen.de>
To: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Cc: Florian Westphal <fw@strlen.de>, stable@vger.kernel.org,
        g.nault@alphalink.fr, gregkh@linuxfoundation.org,
        pablo@netfilter.org
Subject: Re: [PATCH 4.9.y v2] netfilter: nat: Revert "netfilter: nat: convert
 nat bysrc hash to rhashtable" hash to rhashtable"
Message-ID: <20171115113011.GS5512@breakpoint.cc>
References: <20171115101510.5189-1-fw@strlen.de>
 <18a37317-fd72-ffa3-bb81-59adfd519a58@dd-wrt.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <18a37317-fd72-ffa3-bb81-59adfd519a58@dd-wrt.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Sebastian Gottschall <s.gottschall@dd-wrt.com> wrote:
> your patch is not clean

Please stop top-posting.

> patching file net/netfilter/nf_nat_core.c
> Hunk #7 succeeded at 550 (offset 6 lines).
> Hunk #8 FAILED at 672.
> Hunk #9 succeeded at 819 (offset 10 lines).
> Hunk #10 succeeded at 852 (offset 10 lines).
> Hunk #11 succeeded at 872 (offset 10 lines).
> 
> nf_nat_cleanup_conntrack is wrong
> 
> your patch
> 
> @@ -672,9 +645,11 @@ EXPORT_SYMBOL_GPL(nf_nat_l3proto_unregister);
> �/* No one using conntrack by the time this called. */
> �static void nf_nat_cleanup_conntrack(struct nf_conn *ct)
> �{
> -������ if (ct->status & IPS_SRC_NAT_DONE)
> -�������������� rhltable_remove(&nf_nat_bysource_table, &ct->nat_bysource,
> -������������������������������ nf_nat_bysource_params);
> +������ if (ct->status & IPS_SRC_NAT_DONE) {
> +�������������� spin_lock_bh(&nf_nat_lock);
> +�������������� hlist_del_rcu(&ct->nat_bysource);
> +�������������� spin_unlock_bh(&nf_nat_lock);
> +������ }
> �}

It assumes
git cherry-pick 6e699867f84c0f358fed233fe6162173aca28e04

to get the IPS_SRC_NAT_DONE test.