From patchwork Thu Aug 21 02:32:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 381847 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EB31F140078 for ; Thu, 21 Aug 2014 12:32:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543AbaHUCcU (ORCPT ); Wed, 20 Aug 2014 22:32:20 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:45096 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753467AbaHUCcS (ORCPT ); Wed, 20 Aug 2014 22:32:18 -0400 Received: by mail-pa0-f43.google.com with SMTP id lf10so13142003pab.2 for ; Wed, 20 Aug 2014 19:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i/2ZgAcIohWETNFCYG84xFHEzxT47nHUqMG1C+XH2pc=; b=f1CyDOxn0CunN7aYl181fp3QXoiGTlHpi/QqTMOef3CB2OttuIPyQP4whRQEXoYQQ5 5f5xung95cAjs2AOMvhYUpIaKUdmLsmhwfmbNuVZuyMatO1N+jLWw9tiHn7lAjP9kgsc tTjgF86fnCinpgQNL5c+w9pOh2yGAlh6OF0SD4SYP6OGeTfpDFC+tj9UFvbvUcDMv6Z8 NbkElLc17ndG1ZkjRKhzz9NmmvqOWLQYCoPwD2ISsm3fd6t2FKD+jblgpc1UGdIj6Itm HIBWe7GoQH9Lj8D88wEGFmNU5rXAPH6uett7w/HNAQVo7oMS+ektacOGb1UGgwjv65my 0G6g== X-Received: by 10.68.125.202 with SMTP id ms10mr57859324pbb.71.1408588338041; Wed, 20 Aug 2014 19:32:18 -0700 (PDT) Received: from wind-OptiPlex-780.corp.ad.wrs.com ([1.202.252.122]) by mx.google.com with ESMTPSA id n10sm36287888pdp.72.2014.08.20.19.32.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Aug 2014 19:32:17 -0700 (PDT) From: Zhu Yanjun X-Google-Original-From: Zhu Yanjun To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, zyjzyj2000@gmail.com, Yue.Tao@windriver.com, alexandre.dietsch@windriver.com, davem@davemloft.net, honkiko@gmail.com, cwang@twopensource.com Cc: Zhu Yanjun Subject: [PATCH 1/1] ipv4: net namespace does not inherit network configurations Date: Thu, 21 Aug 2014 10:32:01 +0800 Message-Id: <1408588321-13537-2-git-send-email-Yanjun.Zhu@windriver.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408588321-13537-1-git-send-email-Yanjun.Zhu@windriver.com> References: <1408588321-13537-1-git-send-email-Yanjun.Zhu@windriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Ipv4 net namespace requires a similar logic change as commit c900a800 [ipv6: fix bad free of addrconf_init_net] introduces for newer kernels. Since a net namespace is independent to another. That is, there is no any relationship between the net namespaces. So a new net namespace should not inherit network configurations from another net namespace including the host. CC: Hong Zhiguo CC: David S. Miller Suggested-by: Cong Wang Signed-off-by: Zhu Yanjun --- net/ipv4/devinet.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index e944937..a16aa39 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2220,28 +2220,23 @@ static __net_init int devinet_init_net(struct net *net) #endif err = -ENOMEM; - all = &ipv4_devconf; - dflt = &ipv4_devconf_dflt; - if (!net_eq(net, &init_net)) { - all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL); - if (all == NULL) - goto err_alloc_all; - - dflt = kmemdup(dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL); - if (dflt == NULL) - goto err_alloc_dflt; + all = kmemdup(&ipv4_devconf, sizeof(ipv4_devconf), GFP_KERNEL); + if (all == NULL) + goto err_alloc_all; + dflt = kmemdup(&ipv4_devconf_dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL); + if (dflt == NULL) + goto err_alloc_dflt; #ifdef CONFIG_SYSCTL - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL); - if (tbl == NULL) - goto err_alloc_ctl; + tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL); + if (tbl == NULL) + goto err_alloc_ctl; - tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1]; - tbl[0].extra1 = all; - tbl[0].extra2 = net; + tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1]; + tbl[0].extra1 = all; + tbl[0].extra2 = net; #endif - } #ifdef CONFIG_SYSCTL err = __devinet_sysctl_register(net, "all", all);