Skip to content

Commit

Permalink
net: fix get_net_ns_by_fd for !CONFIG_NET_NS
Browse files Browse the repository at this point in the history
After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

net/built-in.o: In function `get_net_ns_by_fd':
(.text+0x11976): undefined reference to `netns_operations'
net/built-in.o: In function `get_net_ns_by_fd':
(.text+0x1197a): undefined reference to `netns_operations'

netns_operations is only available if CONFIG_NET_NS is set ...

Caused by commit f063052 ("net: Allow setting the network namespace
by fd").

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
  • Loading branch information
Stephen Rothwell authored and Eric W. Biederman committed May 24, 2011
1 parent 62ca24b commit 956c920
Showing 1 changed file with 27 additions and 22 deletions.
49 changes: 27 additions & 22 deletions net/core/net_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,40 @@ void __put_net(struct net *net)
}
EXPORT_SYMBOL_GPL(__put_net);

struct net *get_net_ns_by_fd(int fd)
{
struct proc_inode *ei;
struct file *file;
struct net *net;

net = ERR_PTR(-EINVAL);
file = proc_ns_fget(fd);
if (!file)
goto out;

ei = PROC_I(file->f_dentry->d_inode);
if (ei->ns_ops != &netns_operations)
goto out;

net = get_net(ei->ns);
out:
if (file)
fput(file);
return net;
}

#else
struct net *copy_net_ns(unsigned long flags, struct net *old_net)
{
if (flags & CLONE_NEWNET)
return ERR_PTR(-EINVAL);
return old_net;
}

struct net *get_net_ns_by_fd(int fd)
{
return ERR_PTR(-EINVAL);
}
#endif

struct net *get_net_ns_by_pid(pid_t pid)
Expand All @@ -345,28 +372,6 @@ struct net *get_net_ns_by_pid(pid_t pid)
}
EXPORT_SYMBOL_GPL(get_net_ns_by_pid);

struct net *get_net_ns_by_fd(int fd)
{
struct proc_inode *ei;
struct file *file;
struct net *net;

net = ERR_PTR(-EINVAL);
file = proc_ns_fget(fd);
if (!file)
goto out;

ei = PROC_I(file->f_dentry->d_inode);
if (ei->ns_ops != &netns_operations)
goto out;

net = get_net(ei->ns);
out:
if (file)
fput(file);
return net;
}

static int __init net_ns_init(void)
{
struct net_generic *ng;
Expand Down

0 comments on commit 956c920

Please sign in to comment.