From patchwork Sun Nov 12 08:47:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Averin X-Patchwork-Id: 837137 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZS8Z4FqYz9t6N for ; Sun, 12 Nov 2017 19:47:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753251AbdKLIr4 (ORCPT ); Sun, 12 Nov 2017 03:47:56 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:7838 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751797AbdKLIrz (ORCPT ); Sun, 12 Nov 2017 03:47:55 -0500 Received: from [172.16.24.21] (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id vAC8ln2q010945; Sun, 12 Nov 2017 11:47:49 +0300 (MSK) From: Vasily Averin Subject: [PATCH v4 13/18] x_tables: exit_net cleanup check added To: netdev@vger.kernel.org Cc: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , netfilter-devel@vger.kernel.org, coreteam@netfilter.org References: <9dfa013e-9098-e155-9c47-a73753338288@virtuozzo.com> Message-ID: Date: Sun, 12 Nov 2017 11:47:49 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <9dfa013e-9098-e155-9c47-a73753338288@virtuozzo.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Be sure that xt.tables array initialized in net_init hook was return to initial state. Signed-off-by: Vasily Averin --- net/netfilter/x_tables.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index d8571f4..119b670 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -1714,8 +1714,18 @@ static int __net_init xt_net_init(struct net *net) return 0; } +static void __net_exit xt_net_exit(struct net *net) +{ + int i; + + for (i = 0; i < NFPROTO_NUMPROTO; i++) + if (WARN_ON_ONCE(!list_empty(&net->xt.tables[i]))) + break; +} + static struct pernet_operations xt_net_ops = { .init = xt_net_init, + .exit = xt_net_exit, }; static int __init xt_init(void)