From patchwork Sun Nov 12 08:44:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Averin X-Patchwork-Id: 837128 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 3yZS4759Xsz9t6N for ; Sun, 12 Nov 2017 19:44:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753093AbdKLIoF (ORCPT ); Sun, 12 Nov 2017 03:44:05 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:12018 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbdKLIoF (ORCPT ); Sun, 12 Nov 2017 03:44:05 -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 vAC8i3lc003718 for ; Sun, 12 Nov 2017 11:44:03 +0300 (MSK) From: Vasily Averin Subject: [PATCH v4 08/18] l2tp: exit_net cleanup check added To: netdev@vger.kernel.org References: <9dfa013e-9098-e155-9c47-a73753338288@virtuozzo.com> Message-ID: <25f9688f-7a83-bec8-cf9d-857d5792a53f@virtuozzo.com> Date: Sun, 12 Nov 2017 11:44:03 +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 l2tp_session_hlist array initialized in net_init hook was return to initial state. Signed-off-by: Vasily Averin --- net/l2tp/l2tp_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 02d6110..eed1e21 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1888,6 +1888,7 @@ static __net_exit void l2tp_exit_net(struct net *net) { struct l2tp_net *pn = l2tp_pernet(net); struct l2tp_tunnel *tunnel = NULL; + int hash; rcu_read_lock_bh(); list_for_each_entry_rcu(tunnel, &pn->l2tp_tunnel_list, list) { @@ -1897,6 +1898,10 @@ static __net_exit void l2tp_exit_net(struct net *net) flush_workqueue(l2tp_wq); rcu_barrier(); + + for (hash = 0; hash < L2TP_HASH_SIZE_2; hash++) + if (WARN_ON_ONCE(!hlist_empty(&pn->l2tp_session_hlist[hash]))) + break; } static struct pernet_operations l2tp_net_ops = {