{"id":809383,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809383/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477589-12045-2-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504477589-12045-2-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:25:43","name":"[01/47] netfilter: expect: add to hash table after expect init","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"68e64d45bed9c5b21c351b73c4ab11efe4d5a329","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477589-12045-2-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1280,"url":"http://patchwork.ozlabs.org/api/1.2/series/1280/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1280","date":"2017-09-03T22:25:42","name":"[01/47] netfilter: expect: add to hash table after expect init","version":1,"mbox":"http://patchwork.ozlabs.org/series/1280/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809383/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809383/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlnfM42jvz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 08:27:23 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753164AbdICW0n (ORCPT );\n\tSun, 3 Sep 2017 18:26:43 -0400","from mail.us.es ([193.147.175.20]:50786 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753097AbdICW0k (ORCPT );\n\tSun, 3 Sep 2017 18:26:40 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 0C6EA190F68\n\tfor ;\n\tMon, 4 Sep 2017 00:26:13 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id EE16DB5030\n\tfor ;\n\tMon, 4 Sep 2017 00:26:12 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid E3D23B502C; Mon, 4 Sep 2017 00:26:12 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 9F4FF2DC85;\n\tMon, 4 Sep 2017 00:26:09 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:26:09 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 4EFB74265A22;\n\tMon, 4 Sep 2017 00:26:09 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 01/47] netfilter: expect: add to hash table after expect init","Date":"Mon, 4 Sep 2017 00:25:43 +0200","Message-Id":"<1504477589-12045-2-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504477589-12045-1-git-send-email-pablo@netfilter.org>","References":"<1504477589-12045-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Florian Westphal \n\nassuming we have lockless readers we should make sure they can only\nsee expectations that have already been initialized.\n\nhlist_add_head_rcu acts as memory barrier, move it after timer setup.\n\nTheoretically we could crash due to a del_timer() on other cpu\nseeing garbage data.\n\nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_conntrack_expect.c | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c\nindex 899c2c36da13..2c63808bea96 100644\n--- a/net/netfilter/nf_conntrack_expect.c\n+++ b/net/netfilter/nf_conntrack_expect.c\n@@ -368,12 +368,6 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)\n \t/* two references : one for hash insert, one for the timer */\n \trefcount_add(2, &exp->use);\n \n-\thlist_add_head_rcu(&exp->lnode, &master_help->expectations);\n-\tmaster_help->expecting[exp->class]++;\n-\n-\thlist_add_head_rcu(&exp->hnode, &nf_ct_expect_hash[h]);\n-\tnet->ct.expect_count++;\n-\n \tsetup_timer(&exp->timeout, nf_ct_expectation_timed_out,\n \t\t (unsigned long)exp);\n \thelper = rcu_dereference_protected(master_help->helper,\n@@ -384,6 +378,12 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)\n \t}\n \tadd_timer(&exp->timeout);\n \n+\thlist_add_head_rcu(&exp->lnode, &master_help->expectations);\n+\tmaster_help->expecting[exp->class]++;\n+\n+\thlist_add_head_rcu(&exp->hnode, &nf_ct_expect_hash[h]);\n+\tnet->ct.expect_count++;\n+\n \tNF_CT_STAT_INC(net, expect_create);\n }\n \n","prefixes":["01/47"]}