diff mbox series

[v3,17/21] nfnetlink_gueue: exit_net cleanup check added

Message ID	ccd9dc71-5cbd-0d0f-d4f3-9d70d1f4ddd3@virtuozzo.com
State	Changes Requested, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Vasily Averin <vvs@virtuozzo.com> Subject: [PATCH v3 17/21] nfnetlink_gueue: exit_net cleanup check added To: netdev@vger.kernel.org Cc: Pablo Neira Ayuso <pablo@netfilter.org>, Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>, Florian Westphal <fw@strlen.de>, netfilter-devel@vger.kernel.org, coreteam@netfilter.org References: <4fdc4264-e338-6ee8-a662-7d98b45733a1@virtuozzo.com> Message-ID: <ccd9dc71-5cbd-0d0f-d4f3-9d70d1f4ddd3@virtuozzo.com> Date: Mon, 6 Nov 2017 16:25:32 +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: <4fdc4264-e338-6ee8-a662-7d98b45733a1@virtuozzo.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	exit_net checks for objects initialized in net_init hook \| expand [v2,00/21] exit_net checks for objects initialized in net_init hook [v3,01/21] grace: replace BUG_ON by WARN_ONCE in exit_net hook [v3,02/21] lockd: added cleanup checks in exit_net hook [v3,03/21] exit_net cleanup: geneve sock_list check [v3,04/21] ppp: exit_net cleanup checks added [v3,05/21] vxlan: exit_net cleanup checks added [v3,06/21] netdev: exit_net cleanup check added [v3,07/21] nfs4blocklayout: exit_net cleanup check added [v3,08/21] nfs client: exit_net cleanup check added [v3,09/21] fib_notifier: exit_net cleanup check added [v3,10/21] fib_rules: exit_net cleanup check added [v3,11/21] clusterip: exit_net cleanup check added [v3,12/21] xfrm6_tunnel: exit_net cleanup check added [v3,13/21] af_key: replace BUG_ON on WARN_ONCE in net_exit hook [v3,14/21] l2tp: exit_net cleanup check added [v3,15/21] nf_tables: exit_net cleanup check added [v3,16/21] nfnetlink_log: exit_net cleanup check added [v3,17/21] nfnetlink_gueue: exit_net cleanup check added [v3,18/21] x_tables: exit_net cleanup check added [v3,19/21] packet: exit_net cleanup check added [v3,20/21] phonet: exit_net cleanup check added [v3,21/21] sunrpc: exit_net cleanup check added

Commit Message

Vasily Averin Nov. 6, 2017, 1:25 p.m. UTC

Be sure that instance_table array initialized in net_init hook
was return to initial state.

Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
 net/netfilter/nfnetlink_queue.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff mbox series

Patch

diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index c979662..139d2b5 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1512,10 +1512,18 @@  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_ONCE(!hlist_empty(&q->instance_table[i]),
+			      "net %x %s: instance_table isn't empty\n",
+			      net->ns.inum, __func__))
+			break;
 }
 
 static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)