Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47580 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756309AbdKOOwG (ORCPT ); Wed, 15 Nov 2017 09:52:06 -0500 Date: Wed, 15 Nov 2017 15:52:11 +0100 From: Greg KH To: Florian Westphal Cc: Sebastian Gottschall , stable@vger.kernel.org, g.nault@alphalink.fr, 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: <20171115145211.GB2397@kroah.com> References: <20171115101510.5189-1-fw@strlen.de> <18a37317-fd72-ffa3-bb81-59adfd519a58@dd-wrt.com> <20171115113011.GS5512@breakpoint.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20171115113011.GS5512@breakpoint.cc> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Nov 15, 2017 at 12:30:11PM +0100, Florian Westphal wrote: > Sebastian Gottschall 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. Can you all submit a "clean" patch series against the next 4.9-stable release I do in an hour? thanks, greg k-h