From patchwork Thu May 23 08:42:36 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: 245843 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 75BDA2C00A4 for ; Thu, 23 May 2013 18:42:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757306Ab3EWImu (ORCPT ); Thu, 23 May 2013 04:42:50 -0400 Received: from mail.us.es ([193.147.175.20]:33598 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757256Ab3EWImr (ORCPT ); Thu, 23 May 2013 04:42:47 -0400 Received: (qmail 22557 invoked from network); 23 May 2013 10:42:44 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 23 May 2013 10:42:44 +0200 Received: (qmail 5461 invoked by uid 507); 23 May 2013 08:42:44 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17262. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.2/7.5):. Processed in 1.731293 secs); 23 May 2013 08:42:44 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 23 May 2013 08:42:42 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/410/antivirus2); Thu, 23 May 2013 10:42:42 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus2) Received: (qmail 27378 invoked from network); 23 May 2013 10:42:42 +0200 Received: from 1984.lsi.us.es (HELO soleta.ugr.es) (pneira@us.es@150.214.188.80) by us.es with SMTP; 23 May 2013 10:42:42 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH 2/3] netfilter: don't panic on error while walking through the init path Date: Thu, 23 May 2013 10:42:36 +0200 Message-Id: <1369298557-5351-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369298557-5351-1-git-send-email-pablo@netfilter.org> References: <1369298557-5351-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Don't panic if we hit an error while adding the nf_log or pernet netfilter support, just bail out. Signed-off-by: Pablo Neira Ayuso Acked-by: Gao feng --- net/netfilter/core.c | 19 ++++++++++++++----- net/netfilter/nf_log.c | 5 +---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 07c865a..3905104 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -304,15 +304,24 @@ static struct pernet_operations netfilter_net_ops = { void __init netfilter_init(void) { - int i, h; + int i, h, ret; + for (i = 0; i < ARRAY_SIZE(nf_hooks); i++) { for (h = 0; h < NF_MAX_HOOKS; h++) INIT_LIST_HEAD(&nf_hooks[i][h]); } - if (register_pernet_subsys(&netfilter_net_ops) < 0) - panic("cannot create netfilter proc entry"); + ret = register_pernet_subsys(&netfilter_net_ops); + if (ret < 0) + goto err; + + ret = netfilter_log_init(); + if (ret < 0) + goto err_pernet; - if (netfilter_log_init() < 0) - panic("cannot initialize nf_log"); + return 0; +err_pernet: + unregister_pernet_subsys(&netfilter_net_ops); +err: + return ret; } diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 388656d..bd5474a 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -368,10 +368,7 @@ static int __net_init nf_log_net_init(struct net *net) return 0; out_sysctl: - /* For init_net: errors will trigger panic, don't unroll on error. */ - if (!net_eq(net, &init_net)) - remove_proc_entry("nf_log", net->nf.proc_netfilter); - + remove_proc_entry("nf_log", net->nf.proc_netfilter); return ret; }