From patchwork Tue Sep 17 22:14:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 275561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 372292C009F for ; Wed, 18 Sep 2013 08:15:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435Ab3IQWPJ (ORCPT ); Tue, 17 Sep 2013 18:15:09 -0400 Received: from mail.us.es ([193.147.175.20]:35577 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753288Ab3IQWPI (ORCPT ); Tue, 17 Sep 2013 18:15:08 -0400 Received: (qmail 27373 invoked from network); 18 Sep 2013 00:15:06 +0200 Received: from unknown (HELO us.es) (192.168.2.14) by us.es with SMTP; 18 Sep 2013 00:15:06 +0200 Received: (qmail 2718 invoked by uid 507); 17 Sep 2013 22:15:21 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus4 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17869. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-95.6/7.5):. Processed in 1.689074 secs); 17 Sep 2013 22:15:21 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus4 X-Spam-Level: X-Spam-Status: No, score=-95.6 required=7.5 tests=BAYES_50,RCVD_IN_BRBL, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 95.20.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus4) (127.0.0.1) by us.es with SMTP; 17 Sep 2013 22:15:19 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus4 (F-Secure/fsigk_smtp/410/antivirus4); Wed, 18 Sep 2013 00:15:19 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus4) Received: (qmail 30147 invoked from network); 18 Sep 2013 00:15:04 +0200 Received: from 89.63.20.95.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@95.20.63.89) by mail.us.es with SMTP; 18 Sep 2013 00:15:04 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH 1/2] netfilter: nf_tables: attach replacement rule after stale one Date: Wed, 18 Sep 2013 00:14:54 +0200 Message-Id: <1379456095-4070-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Insert the new rule after the existing stale one that will be removed in the commit phase. Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 755d596..0e55e1b 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1659,7 +1659,8 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, rupd = nf_tables_trans_add(old_rule, &ctx); if (rupd == NULL) goto err2; - list_add_tail_rcu(&rule->list, &chain->rules); + + list_add_tail(&rule->list, &old_rule->list); } else if (nlh->nlmsg_flags & NLM_F_APPEND) if (old_rule) list_add_rcu(&rule->list, &old_rule->list);