diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-16 03:02:56 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-19 01:30:55 (GMT) |
| commit | 2407dc25f741cf73853e0521ce9257531c9fc61d (patch) | |
| tree | 423a867f35d847b7870edefb7d86fe63290c4613 /include/net/net_namespace.h | |
| parent | 75fe83c32248d99e6d5fe64155e519b78bb90481 (diff) | |
| download | linux-2407dc25f741cf73853e0521ce9257531c9fc61d.tar.xz | |
netns: Deduplicate and fix copy_net_ns when !CONFIG_NET_NS
The copy of copy_net_ns used when the network stack is not
built is broken as it does not return -EINVAL when attempting
to create a new network namespace. We don't even have
a previous network namespace.
Since we need a copy of copy_net_ns in net/net_namespace.h that is
available when the networking stack is not built at all move the
correct version of copy_net_ns from net_namespace.c into net_namespace.h
Leaving us with just 2 versions of copy_net_ns. One version for when
we compile in network namespace suport and another stub for all other
occasions.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 95e6466..32dcb60 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -126,16 +126,19 @@ struct net { /* Init's network namespace */ extern struct net init_net; -#ifdef CONFIG_NET +#ifdef CONFIG_NET_NS extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); -#else /* CONFIG_NET */ -static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) +#else /* CONFIG_NET_NS */ +#include <linux/sched.h> +#include <linux/nsproxy.h> +static inline struct net *copy_net_ns(unsigned long flags, struct net *old_net) { - /* There is nothing to copy so this is a noop */ - return net_ns; + if (flags & CLONE_NEWNET) + return ERR_PTR(-EINVAL); + return old_net; } -#endif /* CONFIG_NET */ +#endif /* CONFIG_NET_NS */ extern struct list_head net_namespace_list; |