From patchwork Sun Nov 12 08:51:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Averin X-Patchwork-Id: 837143 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 3yZSDb6qCWz9t6N for ; Sun, 12 Nov 2017 19:51:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbdKLIv0 (ORCPT ); Sun, 12 Nov 2017 03:51:26 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:13689 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753052AbdKLIvZ (ORCPT ); Sun, 12 Nov 2017 03:51:25 -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 vAC8pEeX006215; Sun, 12 Nov 2017 11:51:14 +0300 (MSK) From: Vasily Averin Subject: [PATCH v4 18/18] xfrm6_tunnel: exit_net cleanup check added To: netdev@vger.kernel.org Cc: Steffen Klassert , Herbert Xu , Hideaki YOSHIFUJI References: <9dfa013e-9098-e155-9c47-a73753338288@virtuozzo.com> Message-ID: <872520c7-8c52-ff74-4e64-0fc33e7cc1f0@virtuozzo.com> Date: Sun, 12 Nov 2017 11:51:14 +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 spi_byaddr and spi_byspi arrays initialized in net_init hook were return to initial state Signed-off-by: Vasily Averin --- net/ipv6/xfrm6_tunnel.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 4e438bc..09ec069 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -338,6 +338,16 @@ static int __net_init xfrm6_tunnel_net_init(struct net *net) static void __net_exit xfrm6_tunnel_net_exit(struct net *net) { + struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net); + unsigned int i; + + for (i = 0; i < XFRM6_TUNNEL_SPI_BYADDR_HSIZE; i++) + if (WARN_ON_ONCE(!hlist_empty(&xfrm6_tn->spi_byaddr[i]))) + break; + + for (i = 0; i < XFRM6_TUNNEL_SPI_BYSPI_HSIZE; i++) + if (WARN_ON_ONCE(!hlist_empty(&xfrm6_tn->spi_byspi[i]))) + break; } static struct pernet_operations xfrm6_tunnel_net_ops = {