netdev - [PATCH] Revert "net: minor cleanup to net

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110612110950.GA11321@p183.telecom.by>
Date:	Sun, 12 Jun 2011 14:09:50 +0300
From:	Alexey Dobriyan <adobriyan@...il.com>
To:	davem@...emloft.net
Cc:	netdev@...r.kernel.org, rlandley@...allels.com, jpirko@...hat.com
Subject: [PATCH] Revert "net: minor cleanup to net_namespace.c."

git revert 911cb193f3eb0370f20fbba712211e55ffede4de

	commit 911cb193f3eb0370f20fbba712211e55ffede4de
	Author: Rob Landley <rlandley@...allels.com>
	Date:   Fri Apr 15 02:26:25 2011 +0000
	
	    net: minor cleanup to net_namespace.c.
	    
	    Inline a small static function that's only ever called from one place.
	    
	    Signed-off-by: Rob Landley <rlandley@...allels.com>
	    Reviewed-by: Jiri Pirko <jpirko@...hat.com>
	    Signed-off-by: David S. Miller <davem@...emloft.net>

Rationale for net_create() still holds:
* C/R and other out-of-tree code uses or will use it,
* permissions checks are separate thing (and different in C/R case),
* one function doesn't hurt anything.

Signed-off-by: Alexey Dobriyan <adobriyan@...il.com>
---

 net/core/net_namespace.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -210,14 +210,11 @@ static void net_free(struct net *net)
 	kmem_cache_free(net_cachep, net);
 }
 
-struct net *copy_net_ns(unsigned long flags, struct net *old_net)
+static struct net *net_create(void)
 {
 	struct net *net;
 	int rv;
 
-	if (!(flags & CLONE_NEWNET))
-		return get_net(old_net);
-
 	net = net_alloc();
 	if (!net)
 		return ERR_PTR(-ENOMEM);
@@ -236,6 +233,13 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 	return net;
 }
 
+struct net *copy_net_ns(unsigned long flags, struct net *old_net)
+{
+	if (!(flags & CLONE_NEWNET))
+		return get_net(old_net);
+	return net_create();
+}
+
 static DEFINE_SPINLOCK(cleanup_list_lock);
 static LIST_HEAD(cleanup_list);  /* Must hold cleanup_list_lock to touch */
 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html