Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2340926imm; Mon, 28 May 2018 06:22:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqNuPFkIyZX4g1SaqF1yaem7OYNzuOvud/OMQF4QsxPX2K5gudfyO671ZsIy0wtbKtNFP1k X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr13963060pld.268.1527513743129; Mon, 28 May 2018 06:22:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527513743; cv=none; d=google.com; s=arc-20160816; b=u174wEQxh4BnSQemn9GTSJ/bmmcony7yMgy8EypaL5YAzmtvi+AE4bWRUR86o5p64z vRs6WamxvTj1x9BwQMGIpGtDOlMEbsS9kr2fXaEfupT8byQXc/x6S1nMzyy6PpbK5DWC ZSZCwpdPmVXDDfa+PS5lLngR6WA1PDkQ/lj3ggZ+yvbAVDgRCVTz3MlpBu4fMt6rt1af pn89yOkY8R+A5RDntROPk/xgnK4mCTUoGKc43KHtEwojgp+RenSwldfcldi8FgiohMho 1ufitoGDZlEzfqFkjC/vRNqL4TIh0M5neLeAU/ldiZ1Sjf0fe3K29T5zSvkLdTytIDr/ FNUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=pJfJc+QKbiWX04U/1xwZMhvqkyxCaW683L/8fvNRGPk=; b=CBFPHaXQHJx3UmFeUoiPF4y0/NFMSgqsB1JaqRGJhsWGlQBBymxdTxvrZnaswMoTb6 ksczcGzLS65ngTOTgqgrJz4e3kYpQjfh9wMCgXb4fO2ozoqu5z0+O8iXs6f0eWNIOcD6 HFyvLsEP+opYRrzBTrynSMxBq0xzZF+QHI/qHPvcm3Z6IF0o176uYOHHZX+StMe1mYRf YrHwQ09H9/Q1FEckSEJkG1b56j1oR3wdmvBcjeu5AuRPNBT86kbbuKBy+iUfq82bQaKV ySPv9F3DUEXSdLWeL2x6g5r/LDi2EPbLJtXrg+wdp8uI+oDUUJ2fLDfJlBt8/uroyyMw bCPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hcXHuqak; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i88-v6si2827605pfa.219.2018.05.28.06.22.08; Mon, 28 May 2018 06:22:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hcXHuqak; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165299AbeE1NVY (ORCPT + 99 others); Mon, 28 May 2018 09:21:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:38878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163440AbeE1KtF (ORCPT ); Mon, 28 May 2018 06:49:05 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E84BA20844; Mon, 28 May 2018 10:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504545; bh=o5UNMs05iR6N+BplVHi9kcdGLtNEiZ8OmexRcFbJ4S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcXHuqaksnIcnZ21ytA2NJHHdUA7xxd8dlw67baF4POFNRteMS/gXQaklIKtS9Z+X akZt2Ka+x1OpWGct/tV4twJ3ZtBaXU4VUkIj7e4azkoj3OVDmIVCgK2/Z9vffU+bZW oj9vk0lj0nWCAWtmjP03iaTMkTANhnMxnP36SoNs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.14 145/496] netfilter: ipt_CLUSTERIP: put config instead of freeing it Date: Mon, 28 May 2018 11:58:50 +0200 Message-Id: <20180528100326.022704026@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal [ Upstream commit 1a9da5937386dbe553ffcf6c65d985bd48c347c5 ] Once struct is added to per-netns list it becomes visible to other cpus, so we cannot use kfree(). Also delay setting entries refcount to 1 until after everything is initialised so that when we call clusterip_config_put() in this spot entries is still zero. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -228,7 +228,6 @@ clusterip_config_init(struct net *net, c c->hash_mode = i->hash_mode; c->hash_initval = i->hash_initval; refcount_set(&c->refcount, 1); - refcount_set(&c->entries, 1); spin_lock_bh(&cn->lock); if (__clusterip_config_find(net, ip)) { @@ -259,8 +258,10 @@ clusterip_config_init(struct net *net, c c->notifier.notifier_call = clusterip_netdev_event; err = register_netdevice_notifier(&c->notifier); - if (!err) + if (!err) { + refcount_set(&c->entries, 1); return c; + } #ifdef CONFIG_PROC_FS proc_remove(c->pde); @@ -269,7 +270,7 @@ err: spin_lock_bh(&cn->lock); list_del_rcu(&c->list); spin_unlock_bh(&cn->lock); - kfree(c); + clusterip_config_put(c); return ERR_PTR(err); }