From patchwork Wed Jun 17 15:28:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 485518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 606EA140295 for ; Thu, 18 Jun 2015 01:38:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757567AbbFQPip (ORCPT ); Wed, 17 Jun 2015 11:38:45 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:40955 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757407AbbFQPiZ (ORCPT ); Wed, 17 Jun 2015 11:38:25 -0400 Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1Z5FQ0-0001V6-VA; Wed, 17 Jun 2015 09:38:24 -0600 Received: from 67-3-205-90.omah.qwest.net ([67.3.205.90] helo=x220.int.ebiederm.org) by in02.mta.xmission.com with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1Z5FOC-0008Nk-VN; Wed, 17 Jun 2015 09:36:33 -0600 From: "Eric W. Biederman" To: David Miller Cc: , netfilter-devel@vger.kernel.org, Stephen Hemminger , Juanjo Ciarlante , Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , Jamal Hadi Salim , Steffen Klassert , Herbert Xu Date: Wed, 17 Jun 2015 10:28:43 -0500 Message-Id: <1434554932-4552-34-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <87r3pae5hn.fsf@x220.int.ebiederm.org> References: <87r3pae5hn.fsf@x220.int.ebiederm.org> X-XM-AID: U2FsdGVkX19543NAFbw5UYR16ijqsbmzd9sYNipSkcI= X-SA-Exim-Connect-IP: 67.3.205.90 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sa06.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE, TVD_RCVD_IP, T_TM2_M_HEADER_IN_MSG, T_TooManySym_01, XMSubLong autolearn=disabled version=3.4.0 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.0 T_TM2_M_HEADER_IN_MSG BODY: No description available. * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5005] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;David Miller X-Spam-Relay-Country: X-Spam-Timing: total 311 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 14 (4.4%), b_tie_ro: 13 (4.1%), parse: 2.1 (0.7%), extract_message_metadata: 18 (5.8%), get_uri_detail_list: 1.52 (0.5%), tests_pri_-1000: 10 (3.2%), tests_pri_-950: 1.52 (0.5%), tests_pri_-900: 1.22 (0.4%), tests_pri_-400: 23 (7.4%), check_bayes: 22 (6.9%), b_tokenize: 7 (2.1%), b_tok_get_all: 6 (1.9%), b_comp_prob: 1.87 (0.6%), b_tok_touch_all: 4.5 (1.4%), b_finish: 0.81 (0.3%), tests_pri_0: 231 (74.2%), tests_pri_500: 6 (2.0%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 34/43] netfilter: bridge: adapt it to pernet hooks X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric W Biederman Since pernet hooks, we need to register the hook for each netnamespace space. Based on a patch by Pablo Neira Ayuso that was buggy and did a lot more. Signed-off-by: Eric W Biederman --- net/bridge/br_netfilter.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 15d0f3b78145..c6acff3a94ec 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -1246,11 +1246,26 @@ static struct ctl_table brnf_table[] = { }; #endif +static int __net_init br_nf_net_init(struct net *net) +{ + return nf_register_hooks(net, br_nf_ops, ARRAY_SIZE(br_nf_ops)); +} + +static void __net_exit br_nf_net_exit(struct net *net) +{ + nf_unregister_hooks(net, br_nf_ops, ARRAY_SIZE(br_nf_ops)); +} + +static struct pernet_operations br_nf_net_ops = { + .init = br_nf_net_init, + .exit = br_nf_net_exit, +}; + static int __init br_netfilter_init(void) { int ret; - ret = nf_register_hooks(&init_net, br_nf_ops, ARRAY_SIZE(br_nf_ops)); + ret = register_pernet_subsys(&br_nf_net_ops); if (ret < 0) return ret; @@ -1271,7 +1286,6 @@ static int __init br_netfilter_init(void) static void __exit br_netfilter_fini(void) { RCU_INIT_POINTER(nf_br_ops, NULL); - nf_unregister_hooks(&init_net, br_nf_ops, ARRAY_SIZE(br_nf_ops)); #ifdef CONFIG_SYSCTL unregister_net_sysctl_table(brnf_sysctl_header); #endif