From patchwork Sun Nov 12 08:47:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Averin X-Patchwork-Id: 837135 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 3yZS7g1MHFz9t6N for ; Sun, 12 Nov 2017 19:47:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753160AbdKLIrJ (ORCPT ); Sun, 12 Nov 2017 03:47:09 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:18643 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751797AbdKLIrI (ORCPT ); Sun, 12 Nov 2017 03:47:08 -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 vAC8l17Z021015; Sun, 12 Nov 2017 11:47:01 +0300 (MSK) From: Vasily Averin Subject: [PATCH v4 12/18] nfnetlink_gueue: 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:01 +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 instance_table array initialized in net_init hook was return to initial state. Signed-off-by: Vasily Averin Acked-by: Florian Westphal --- net/netfilter/nfnetlink_queue.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index c979662..fd41077 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1512,10 +1512,16 @@ static int __net_init nfnl_queue_net_init(struct net *net) static void __net_exit nfnl_queue_net_exit(struct net *net) { + unsigned int i; + struct nfnl_queue_net *q = nfnl_queue_pernet(net); + nf_unregister_queue_handler(net); #ifdef CONFIG_PROC_FS remove_proc_entry("nfnetlink_queue", net->nf.proc_netfilter); #endif + for (i = 0; i < INSTANCE_BUCKETS; i++) + if (WARN_ON_ONCE(!hlist_empty(&q->instance_table[i]))) + break; } static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)