From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 842EBC43381 for ; Fri, 22 Feb 2019 17:11:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5324520700 for ; Fri, 22 Feb 2019 17:11:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GucT+gcI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727300AbfBVRLZ (ORCPT ); Fri, 22 Feb 2019 12:11:25 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:46875 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727031AbfBVRLY (ORCPT ); Fri, 22 Feb 2019 12:11:24 -0500 Received: by mail-pl1-f194.google.com with SMTP id o6so1341630pls.13 for ; Fri, 22 Feb 2019 09:11:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=F+bYy1OwlL4IU5Y9okoQZw+jVVIbSghIAcCO291rL1s=; b=GucT+gcIPFaqCa2P4FDGoV5mMepUR5G9Tnq6kpVEhAofiBZ/zvfKwKI919fH5kwAU6 +gx7P3THVBIbcGh2USjlTi8xSkUDiK+GKf5VC6IimSmYxtWr8Z2KIbX0phv4fNPLpIfe B6nlzl5ZCt+dXQZEDdUjd/LOJZQVrMnqkKE5kHME7G0mF7CiUzCkwhynhL5qSTlp2XWA 3hJWb4wRGUACjOVi+OKpkgxVUnHHLuWjW6pK9HOYg/CTwbbZ56X8xGEPjF0OtHX0A651 nPQ4rDA5LcU319y4nv3Gbgy1vbG+n5ssWcUtiZBu3B6Yi9N+i75Lj1Y4IZJ9rg30R/UF ibkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=F+bYy1OwlL4IU5Y9okoQZw+jVVIbSghIAcCO291rL1s=; b=iCJi3003Xu3xIHdWNoi51BG1i4xQaH4J/SsQw++f38WGNsvCvld81swRIMQsXSt8TJ vXLKBNPuR8FoK/EPlBc9b+9idJF5Rcffc5DerOVABKPwXtbXNwBJQ2V9IK3tb8togZ1A LkAZDdrelF6EgUHzvYYP/1Xaa2WeB1YvZ/DfYY5TOQfLDvpH68V4s5n9oucwvuF3eL2F u3Dlv9+nhYqNo+bKy5VH5+X08G/xb/VQ7ggHkxwF7fql+D2w0aA1ADTULCzsmVkIyFpQ 8TzkmZCIAFf7/9ZBSzZxLeCXknZGN5UWrflQgR2PhDN3PCnh5awBXU/DsxTfI8KsLWXG v9Ig== X-Gm-Message-State: AHQUAubxFEdQj9B7c58TgxsCHP3p/DGo94XfynGF9WFuxJnwP8td2ziY Zq9ku4aj3jWEGZVR/11N7iZKFFrs X-Google-Smtp-Source: AHgI3Ibr3vf6lBvqwQ4s/EFAc5xZHkr1BADVpgF2fB0dFUbuJqxws6FTc1lHdff2BhEbW6IH4Q5iAw== X-Received: by 2002:a17:902:7006:: with SMTP id y6mr5134887plk.260.1550855484153; Fri, 22 Feb 2019 09:11:24 -0800 (PST) Received: from [192.168.86.235] (c-73-241-150-70.hsd1.ca.comcast.net. [73.241.150.70]) by smtp.gmail.com with ESMTPSA id j4sm2933319pfn.132.2019.02.22.09.11.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 09:11:23 -0800 (PST) Subject: Re: [PATCH 1/3] ipv4: icmp: use icmp_sk_exit() To: Kefeng Wang , davem@davemloft.net, netdev@vger.kernel.org References: <20190222015800.192135-1-wangkefeng.wang@huawei.com> From: Eric Dumazet Message-ID: Date: Fri, 22 Feb 2019 09:11:22 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190222015800.192135-1-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 02/21/2019 05:57 PM, Kefeng Wang wrote: > Simply use icmp_sk_exit() when inet_ctl_sock_create() fail in icmp_sk_init(). > > Signed-off-by: Kefeng Wang > --- > net/ipv4/icmp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c > index 065997f414e6..364cfe5e414b 100644 > --- a/net/ipv4/icmp.c > +++ b/net/ipv4/icmp.c > @@ -1245,9 +1245,7 @@ static int __net_init icmp_sk_init(struct net *net) > return 0; > > fail: > - for_each_possible_cpu(i) > - inet_ctl_sock_destroy(*per_cpu_ptr(net->ipv4.icmp_sk, i)); > - free_percpu(net->ipv4.icmp_sk); > + icmp_sk_exit(net); > return err; > } > > I do not like this. Future changes in icmp_sk_exit() might trigger a bug in this seldom tested path.